1 files changed, 0 insertions, 3 deletions
diff --git a/configure b/configure
index ede8020f..be6f2180 100755
--- a/configure
+++ b/configure
@@ -470,10 +470,7 @@ if test "$arch" = "mppa_k1c"; then
   system="linux"
 fi
 
-<<<<<<< HEAD
-=======
 #
->>>>>>> mppa-work
 # AArch64 (ARMv8 64 bits) Target Configuration
 #
 if test "$arch" = "aarch64"; then