[Cvs-cvs] Changes to ccvs/ChangeLog

[Derek Robert Price]

Index: ccvs/ChangeLog
diff -u ccvs/ChangeLog:1.1254 ccvs/ChangeLog:1.1255
--- ccvs/ChangeLog:1.1254       Tue Sep 20 17:05:39 2005
+++ ccvs/ChangeLog      Fri Sep 23 03:19:21 2005
@@ -1,4 +1,8 @@
-2005-09-20  Conrad T. Pino  <address@hidden>
+2005-09-22  Derek Price  <address@hidden>
+
+       * NEWS: Mention conflict fixes.
+
+2005-09-20  Conrad T. Pino  <address@hidden>
 
        * cvsnt.dsp: Add files (lib\canon-host.h lib\glob-libc.h) to project.