Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.3160
diff -u -3 -p -u -r1.3160 ChangeLog
--- ChangeLog	3 Feb 2005 22:37:27 -0000	1.3160
+++ ChangeLog	4 Feb 2005 01:45:34 -0000
@@ -294,7 +294,6 @@
 	(getDisplayVariant(java.util.Locale)): Likewise.
 	(getDisplayString()): Rewritten in LocaleHelper.
 	
->>>>>>> 1.3159
 2005-01-29  Quentin Anciaux  <address@hidden>
 
 	* gnu/classpath/SystemProperties.java (static): Add all aliases