From 58efd74528d0c8c07d9e49d1756902ebf661e6a1 Mon Sep 17 00:00:00 2001
From: Ken Rice <krice@freeswitch.org>
Date: Fri, 21 Feb 2014 15:12:21 -0600
Subject: [PATCH] oops

---
 configure.in | 1 -
 1 file changed, 1 deletion(-)

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