From: Ken Rice <krice@freeswitch.org>
Date: Fri, 21 Feb 2014 21:12:21 +0000 (-0600)
Subject: oops
X-Git-Tag: v1.2.23~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58efd74528d0c8c07d9e49d1756902ebf661e6a1;p=thirdparty%2Ffreeswitch.git

oops
---

diff --git a/configure.in b/configure.in
index ec6bc811ad..e8681818d5 100644
--- 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