Fixed an unresolved merge.

Author: Manuel Astudillo

Makefile.gcc

@@ -1,12 +1,9 @@
 # Project: cpp-gpengine
 # Makefile created by Pablo Garcia Ganzalez 
-<<<<<<< HEAD
+
 # Date: 05.04.2004
 # CVS-ID: $Id: Makefile.gcc,v 1.2 2004/04/05 21:00:00 xtremox Exp $
-=======
-# Date: 19.10.2003
-# CVS-ID: $Id: Makefile.gcc,v 1.1.2.1 2003/11/30 12:55:29 d00mas Exp $
->>>>>>> RELEASE_1_0_4
+
 
 CPP  = g++ 
 OBJ  = 	src/ASTCreator.o  src/ASTNode.o src/CGTFile.o src/CharacterSetTable.o src/DFA.o src/DFAStateTable.o src/ErrorReporter.o src/ErrorTable.o src/GrammarInfo.o src/LALR.o src/LALRStateTable.o src/NonTerminal.o src/RuleTable.o src/Symbol.o src/SymbolTable.o src/Terminal.o src/Token.o