1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index 5dfac1a8..ede8020f 100755
--- a/configure
+++ b/configure
@@ -470,6 +470,10 @@ if test "$arch" = "mppa_k1c"; then
   system="linux"
 fi
 
+<<<<<<< HEAD
+=======
+#
+>>>>>>> mppa-work
 # AArch64 (ARMv8 64 bits) Target Configuration
 #
 if test "$arch" = "aarch64"; then
@@ -910,6 +914,4 @@ cat <<EOF
     Coq development will not be installed
 EOF
 fi
-
 fi
-