From f60d7cf67d98996f750c8acee4b2f28600bf3ddb Mon Sep 17 00:00:00 2001
From: rwaldron <waldron.rick@gmail.com>
Date: Tue, 5 Apr 2022 11:18:45 -0400
Subject: [PATCH] fixup! Fix false negative in for-in test

---
 test/language/statements/for-in/S12.6.4_A7_T2.js | 4 ----
 1 file changed, 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
index 9e539b76eac..b7043d78b4a 100644
--- 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){