oops

58efd745 · Ken Rice · f067d230 · 58efd745
--- a/configure.in
+++ b/configure.in
 #                                               -*- Autoconf -*-
->>>>>>> 1a85246... svn has been long retired
 # Process this file with autoconf to produce a configure script.

 # Must change all of the below together