From 62c2f45fbb34703ebc6c43819f4450da5601dff4 Mon Sep 17 00:00:00 2001
From: Christopher Pulte
Date: Mon, 19 Sep 2016 12:51:57 +0100
Subject: remove conflict message

---
 src/lem_interp/interp_interface.lem | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/lem_interp/interp_interface.lem b/src/lem_interp/interp_interface.lem
index 9abb561d..cc0bef06 100644
--- a/src/lem_interp/interp_interface.lem
+++ b/src/lem_interp/interp_interface.lem
@@ -401,8 +401,6 @@ type read_kind =
   (* AArch64 reads *)
   | Read_acquire | Read_exclusive | Read_exclusive_acquire | Read_stream
 
-<<<<<<< Updated upstream
-=======
 instance (Show read_kind)
   let show = function
     | Read_plain -> "Read_plain"
@@ -415,7 +413,7 @@ instance (Show read_kind)
   end
 end
 
->>>>>>> Stashed changes
+
 type write_kind =
   (* common writes *)
     Write_plain
-- 
cgit v1.2.3