fix bad dbhash file

iotaledger · Sep 14, 2023 · 2779cca · 2779cca
1 parent 0a87348
commit 2779cca
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/packages/testutil/testdbhash/TestStorageContract.hex b/packages/testutil/testdbhash/TestStorageContract.hex
@@ -1,7 +1 @@
-<<<<<<< HEAD
-0xd82d1ed0c4dcd2e98b21ac264c64089713adb96c5a824552f4fff257eb9d6e73
-||||||| parent of 20cfdef9c (feat: allow multi-chain interactions with EVM AgentID (BREAKING))
-0x067c2015d0e63eb81b311fcddc20693668c18b575752786aa0288ce59c820391
-=======
-0xee396c03ba13260bbf75d8093d4d3d3cd92ee78e766cf09267ddf8f7990be3d7
->>>>>>> 20cfdef9c (feat: allow multi-chain interactions with EVM AgentID (BREAKING))
+0xa400ec6dfc8ab5d3a36a37f72ffc5536b7c250e4a243bdcd043769fba228d18c