oops

diff --git a/configure.in b/configure.in
index af70416f13c14760eba096ab3a65386764d7357e..f395c5df28ebdad9b24da3ab9131c16790398689 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,4 @@
 #                                               -*- Autoconf -*-
->>>>>>> 1a85246... svn has been long retired
 # Process this file with autoconf to produce a configure script.
 
 # Must change all of the below together