[Gnash-commit] gnash ChangeLog

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/05/23 07:35:41

Modified files:
        .              : ChangeLog 

Log message:
        Drop someone's conflict indicators.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6683
retrieving revision 1.6684
diff -u -b -r1.6683 -r1.6684
--- ChangeLog   23 May 2008 07:33:25 -0000      1.6683
+++ ChangeLog   23 May 2008 07:35:41 -0000      1.6684
@@ -333,7 +333,6 @@
        * configure.ac: have KPARTS install dir summary use 'KPARTS' label,
          to conform with that given by 'make dumpconfig'.
 
->>>>>>> 1.6678
 2008-05-17 Sandro Santilli <address@hidden>
 
        * server/vm/ActionExec.cpp (setLocalVariable): use scope stack