From f59c6c92cf6bd12d21179dbdb268eef0ba91b3dd Mon Sep 17 00:00:00 2001
From: Perry Kivolowitz <perry@kivolowitz.com>
Date: Sat, 15 Apr 2023 22:22:24 -0500
Subject: [PATCH] duh

---
 macros/apple-linux-convergence.S | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/macros/apple-linux-convergence.S b/macros/apple-linux-convergence.S
index 295c14f..8827423 100644
--- a/macros/apple-linux-convergence.S
+++ b/macros/apple-linux-convergence.S
@@ -148,12 +148,9 @@ main:
 .macro  AASCIZ      label, string
         .p2align    2
 \label: .asciz      "\string"
-<<<<<<< HEAD
 .endm
 
 .macro  MOD         src_a, src_b, dest, scratch
         sdiv        \scratch, \src_a, \src_b
         msub        \dest, \scratch, \src_b, \src_a
-=======
->>>>>>> d64aed10129b1011df2b323fee667ec2a5eeab1b
 .endm