From 81f2687f6028fcaf2525a9bc33446cb2a3315526 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 30 Apr 2009 00:13:14 +0000
Subject: [PATCH] Remove accidentally committed conflict marker.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11198 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGES.current b/CHANGES.current
index ac448395a..506ba08be 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -15,7 +15,6 @@ Version 1.3.40 (in progress)
 	    run a little faster (in tests with Xapian on x86-64 Ubuntu 9.04,
 	    the stripped wrapper library was 11% smaller and ran 2.7% faster).
 
->>>>>>> .r11195
 2009-04-21: wsfulton
 	    [C#] Fix #2753469 - bool &OUTPUT and bool *OUTPUT typemaps initialisation.