Fixes conflict in constants

Signed-off-by: Konstantina Blazhukova <[email protected]>
hashgraph · Nov 3, 2023 · bd964e4 · bd964e4
1 parent 8f2dede
commit bd964e4
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/test/constants.js b/test/constants.js
@@ -105,7 +105,6 @@ const Contract = {
   Transaction: 'Transaction',
   MessageFrameAddresses: 'MessageFrameAddresses',
   New: 'New',
-<<<<<<< HEAD
   AssemblyAddress: 'AssemblyAddress',
   AddressContract: 'AddressContract',
   Recipient: 'Recipient',
@@ -118,9 +117,7 @@ const Contract = {
   Defaults: "Defaults",
   NonExisting: "NonExisting",
   NonExtDup: "NonExtDup",
-=======
   BlindAuction: 'BlindAuction'
->>>>>>> 83b21c4 (Adds more tests for blind auciton)
 }
 
 const CALL_EXCEPTION = 'CALL_EXCEPTION'