From 0a96951017afd5159d26e4e34d113e60b51b6675 Mon Sep 17 00:00:00 2001
From: Michael Meskes <meskes@postgresql.org>
Date: Fri, 15 Feb 2008 16:28:47 +0000
Subject: [PATCH] Fixed conflicting commit.

---
 src/interfaces/ecpg/preproc/pgc.l | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index ee2805d157..02ba8240b6 100644
--- 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}
 <C>{identifier} 	{
 						const ScanKeyword		*keyword;
 							
-<<<<<<< pgc.l
-						if (!INFORMIX_MODE && !isdefine())
-=======
 						if (!isdefine())
->>>>>>> 1.162
 						{
 							keyword = ScanCKeywordLookup(yytext);
 							if (keyword != NULL)
-- 
2.50.0