Fixed conflicting commit.

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index ee2805d157f3f60440d7cf01d6a5388ff16efc41..02ba8240b698e0c76cc97ae1d9704d3e8799570d 100644 (file)
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.159.2.1 2008/02/15 12:11:02 meskes Exp $
+ *   $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.159.2.2 2008/02/15 16:28:47 meskes Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -743,11 +743,7 @@ cppline            {space}*#(.*\\{space})*.*{newline}
 {identifier}    {
                        const ScanKeyword       *keyword;
                            
-<<<<<<< pgc.l
-                       if (!INFORMIX_MODE && !isdefine())
-=======
                        if (!isdefine())
->>>>>>> 1.162
                        {
                            keyword = ScanCKeywordLookup(yytext);
                            if (keyword != NULL)