fixup! Fix false negative in for-in test

jessealama · Apr 5, 2022 · f60d7cf · f60d7cf
1 parent 384a4e1
commit f60d7cf
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/test/language/statements/for-in/S12.6.4_A7_T2.js b/test/language/statements/for-in/S12.6.4_A7_T2.js
@@ -28,14 +28,10 @@ for (var __key in __obj){
 
 }
 
-<<<<<<< HEAD
 assert(
 	__accum === "aa1ca3" || __accum === "ca3aa1",
 	"Unexpected value: '" + __accum + "'"
 );
-=======
-assert.sameValue(__accum, "aa1ca3");
->>>>>>> eeb002c698 (Fix false negative in for-in test)
 
 // erasator is the hash map terminator
 function erasator_T_1000(hash_map, charactr){