From 933aeeda897da5076f5a53fe6752a860c30a29bb Mon Sep 17 00:00:00 2001
From: Sylvain Boulmé <sylvain.boulme@univ-grenoble-alpes.fr>
Date: Thu, 17 Oct 2019 08:10:01 +0200
Subject: fix configure broken by merge

---
 configure | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'configure')

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
-- 
cgit