1 files changed, 0 insertions, 6 deletions
diff --git a/configure b/configure
index 63351d7..25697a7 100755
--- a/configure
+++ b/configure
@@ -3786,9 +3786,6 @@ else
 fi
 
 	}
-
-=======
->>>>>>> 0ae36fc (Update --with-isa-spec default option.)
 {
 
 # Check whether --with-dejagnu-src was given.
@@ -3808,9 +3805,6 @@ else
 fi
 
 	}
-
-=======
->>>>>>> 0ae36fc (Update --with-isa-spec default option.)
 {
 
 # Check whether --with-dejagnu-src was given.