From fa03e2113946de36f1115d7a7319d1f6c7920a19 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 9 Feb 2008 12:27:22 +0000
Subject: [PATCH] fix merge

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

diff --git a/CHANGES.current b/CHANGES.current
index c1598fa0e..9e0f3ea24 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -1,7 +1,6 @@
 Version 1.3.34 (in progress)
 ============================
 
-<<<<<<< .mine
 02/09/2007: wsfulton
             [Python] Experimental shared_ptr typemaps added. Usage is the same as the recently
             added Java and C# shared_ptr typemaps. Two macros are available, although these
@@ -78,11 +77,9 @@ Version 1.3.34 (in progress)
 
               %feature("smartptr") "foo::bar"
 
-=======
 02/01/2008: olly
 	    [Python] Fix format string bug (SF#1882220).
 
->>>>>>> .r10235
 01/31/2008: wsfulton
             Additions to the %types directive. Now the conversion / casting code can be
             overridden to some custom code in the %types directive, like so: