update tests

2025-12-23 10:11:56 +00:00 · 2025-12-16 08:57:15 -03:00 · 2025-12-16 08:57:15 -03:00 · 64ac0e1785
commit 64ac0e1785
parent 8ae1f4bf2a
1 changed files with 4 additions and 0 deletions
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.release.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.release.json
@ -10,7 +10,11 @@
      "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
      "indirect": false,
      "name": "SOME_U256",
+<<<<<<< HEAD
      "offset": 304
+=======
+      "offset": 360
+>>>>>>> 198463a87 (update tests)
    }
  ],
  "encodingVersion": "1",