From 3000d9f51eebdd13702ca69d66752459859fdd77 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 22 Oct 2004 21:22:00 +0000
Subject: [PATCH] cvs 'conflict indicators' removed (correct ones this time)

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

diff --git a/CHANGES.current b/CHANGES.current
index 9b2d91f7b..c1536b9c4 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -1,5 +1,5 @@
 Version 1.3.23 (in progress)
-----------------------------
+============================
 
 10/22/2004: wsfulton
             [Java] Patch #1049496 from Scott Michel fixes directors methods with 
@@ -839,8 +839,6 @@ Version 1.3.23 (in progress)
             - Add pyfragments.swg, now the user can add fragments
 	      to override the default ones.
 
-
->>>>>>> 1.292
 09/10/2004: wsfulton
             Patch from Bill Clarke which fixes spurious preprocessor bug which
             shows on Solaris and gcc, eg: