Fixed conflicting commit.

Michael Meskes · Michael Meskes · commit 0a96951017af · 2008-02-15T16:28:47.000Z
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.159.2.1 2008/02/15 12:11:02 meskes Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.159.2.2 2008/02/15 16:28:47 meskes Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -743,11 +743,7 @@ cppline {space}#(.\\{space}).{newline}`
`743`	`743`	`<C>{identifier} {`
`744`	`744`	`const ScanKeyword *keyword;`
`745`	`745`
`746`		`-<<<<<<< pgc.l`
`747`		`- if (!INFORMIX_MODE && !isdefine())`
`748`		`-=======`
`749`	`746`	`if (!isdefine())`
`750`		`->>>>>>> 1.162`
`751`	`747`	`{`
`752`	`748`	`keyword = ScanCKeywordLookup(yytext);`
`753`	`749`	`if (keyword != NULL)`