[Gnash-commit] gnash/gui aqua.cpp

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  08/03/21 04:59:51

Modified files:
        gui            : aqua.cpp 

Log message:
        Indeed a merge error

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua.cpp?cvsroot=gnash&r1=1.31&r2=1.32

Patches:
Index: aqua.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- aqua.cpp    21 Mar 2008 04:37:54 -0000      1.31
+++ aqua.cpp    21 Mar 2008 04:59:51 -0000      1.32
@@ -15,13 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-<<<<<<< aqua.cpp
-// 
-//
-
-/* $Id: aqua.cpp,v 1.31 2008/03/21 04:37:54 nihilus Exp $ */
-=======
->>>>>>> 1.30
+/* $Id: aqua.cpp,v 1.32 2008/03/21 04:59:51 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"