From 2d1097e8a1ecffd09cd6810978b876f8c8cdb16f Mon Sep 17 00:00:00 2001
From: Ian Moffett <ian@osmora.org>
Date: Tue, 29 Jul 2025 04:17:36 -0400
Subject: etc: oemu: Fix conflict in test-00.s

Signed-off-by: Ian Moffett <ian@osmora.org>
---
 etc/oemu/test-00.s | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/etc/oemu/test-00.s b/etc/oemu/test-00.s
index 423bb0e..4b5db7c 100644
--- a/etc/oemu/test-00.s
+++ b/etc/oemu/test-00.s
@@ -12,18 +12,7 @@ some_label:      ! X
     inc x1       ! ~ 0x00000018
     add x2, #3   ! ~ 0x0000001C
     mrow x4, #0  ! ~ 0x00000020
-<<<<<<< HEAD
     nop          ! ~ 0x00000024
     or x1, #3    ! ~ 0x00000028
     xor x2, #3   ! ~ 0x0000002C
     hlt          ! ~ 0x00000030
-=======
-    and x1, #3   ! ~ 0x00000024
-    or x2, #7    ! ~ 0x00000028
-<<<<<<< HEAD
-    hlt          ! ~ 0x0000002C
->>>>>>> 521cc2b (etc: oemu: Add example for 'OR' in test-00.s)
-=======
-    xor x2, #3   ! ~ 0x0000002C
-    hlt          ! ~ 0x00000030
->>>>>>> 5d27983 (etc: oemu: Add XOR example to test-00.s)
-- 
cgit v1.2.3