oops

2014-02-21 15:12:21 -06:00 · 2014-02-21 15:12:21 -06:00 · 0243b95901
parent 2fe0516ac2
commit 0243b95901
1 changed files with 0 additions and 1 deletions
--- 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