From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 4 Dec 2012 17:23:36 +0000 (-0500)
Subject: Fix Makefile breakage caused by a committed merge conflict.
X-Git-Tag: REL9_0_12~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e375ab4b5b1b4308e4c16fc755e45c1ccf1988e;p=postgresql

Fix Makefile breakage caused by a committed merge conflict.
---

diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile
index ced2fc4654..3adf36d8be 100644
--- a/src/interfaces/ecpg/ecpglib/Makefile
+++ b/src/interfaces/ecpg/ecpglib/Makefile
@@ -58,11 +58,7 @@ include $(top_srcdir)/src/Makefile.shlib
 # necessarily use the same object files as the backend uses. Instead,
 # symlink the source files in here and build our own object file.
 
-<<<<<<< HEAD
-path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c: % : $(top_srcdir)/src/port/%
-=======
-path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c win32setlocale.c isinf.c: % : $(top_srcdir)/src/port/%
->>>>>>> 6fc6ebf... Include isinf.o in libecpg if isinf() is not available on the system.
+path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c isinf.c: % : $(top_srcdir)/src/port/%
 	rm -f $@ && $(LN_S) $< .
 
 misc.o: misc.c $(top_builddir)/src/port/pg_config_paths.h