From 0243b9590116198e4e7dc6baf16a4a5aa46b20e0 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 af70416f13..f395c5df28 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