[Gnash-commit] gnash ChangeLog

[Russ Nelson]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Russ Nelson <nelsonrn>  08/03/28 21:53:57

Modified files:
        .              : ChangeLog 

Log message:
        Changelog had a spurious conflict indicator

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6065&r2=1.6066

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6065
retrieving revision 1.6066
diff -u -b -r1.6065 -r1.6066
--- ChangeLog   28 Mar 2008 21:52:28 -0000      1.6065
+++ ChangeLog   28 Mar 2008 21:53:56 -0000      1.6066
@@ -170,7 +170,6 @@
        * libbase/zlib_adapter.h: drop gnashconfig.h where it's not needed,
          replace tu_config.h with dsodefs.h.
 
->>>>>>> 1.6063
 2008-03-27 Benjamin Wolsey <address@hidden>
 
        * server/vm/ASHandlers.{cpp,h}: const correct guessEncoding,