Commit2e375ab

committed

Fix Makefile breakage caused by a committed merge conflict.

1 parentf928ffd commit2e375abCopy full SHA for 2e375ab

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,7 @@ include $(top_srcdir)/src/Makefile.shlib`
`58`	`58`	`# necessarily use the same object files as the backend uses. Instead,`
`59`	`59`	`# symlink the source files in here and build our own object file.`
`60`	`60`
`61`		`-<<<<<<< HEAD`
`62`		`-path.cpgstrcasecmp.csnprintf.cstrlcpy.cthread.c:% :$(top_srcdir)/src/port/%`
`63`		`-=======`
`64`		`-path.cpgstrcasecmp.csnprintf.cstrlcpy.cthread.cwin32setlocale.cisinf.c:% :$(top_srcdir)/src/port/%`
`65`		`->>>>>>> 6fc6ebf... Include isinf.o in libecpg if isinf() is not available on the system.`
	`61`	`+path.cpgstrcasecmp.csnprintf.cstrlcpy.cthread.cisinf.c:% :$(top_srcdir)/src/port/%`
`66`	`62`	`rm -f$@&&$(LN_S)$<.`
`67`	`63`
`68`	`64`	`misc.o: misc.c$(top_builddir)/src/port/pg_config_paths.h`

Comments

(0)