Fixed conflicting commit.

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index e7705dca6b53182788e188ebf09853a10c1bb55e..97edc420fb5922b11a3ad2e508331747354169dd 100644 (file)
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -743,11 +743,7 @@ cppline                    {space}*#(.*\\{space})*.*{newline}
 <C>{identifier}        {
                                                const ScanKeyword               *keyword;
                                                        
-<<<<<<< pgc.l
-                                               if (!INFORMIX_MODE && !isdefine())
-=======
                                                if (!isdefine())
->>>>>>> 1.162
                                                {
                                                        keyword = ScanCKeywordLookup(yytext);
                                                        if (keyword != NULL)