[Gnash-commit] gnash ChangeLog

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/04/17 08:15:06

Modified files:
        .              : ChangeLog 

Log message:
        conflict indicators.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6311
retrieving revision 1.6312
diff -u -b -r1.6311 -r1.6312
--- ChangeLog   17 Apr 2008 08:14:17 -0000      1.6311
+++ ChangeLog   17 Apr 2008 08:15:06 -0000      1.6312
@@ -21,7 +21,6 @@
        * server/asobj/LoadVars.cpp: delegate BOM handling to the new
          specialized utf8:: interface.
 
->>>>>>> 1.6310
 2008-04-16 Sandro Santilli <address@hidden>
 
        * testsuite/actionscript.all/LoadVars.as: check that getBytesLoaded()