oops

0243b959 · Ken Rice · 2fe0516a · 0243b959
--- 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