From 07d1456630208d68696d08587dc671088ac379d2 Mon Sep 17 00:00:00 2001
From: mtardy <mahe5397@hotmail.fr>
Date: Wed, 26 Aug 2020 11:47:29 +0200
Subject: [PATCH] Conflict resolution

---
 parse.leg | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/parse.leg b/parse.leg
index 2fdfe98..59f163e 100644
--- a/parse.leg
+++ b/parse.leg
@@ -1618,11 +1618,6 @@ oop eval(oop scope, oop ast)
     BINARY(Bitor,     | );
     BINARY(Bitxor,    ^ );
     BINARY(Bitand,    & );
-<<<<<<< HEAD
-=======
-//  BINARY(Equal,     ==);
-//  BINARY(Noteq,     !=);
->>>>>>> master
     case t_Equal: {
         oop lhs = eval(scope, map_get(ast, lhs_symbol));
         oop rhs = eval(scope, map_get(ast, rhs_symbol));