oops

diff --git a/configure.in b/configure.in
index ec6bc811ad72c21a83ed5aed9ff7a95a19c2c961..e8681818d5d0277d982bfc94989aee0dd1bf7dff 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