From 5655bc5b45a90c6500a375c789d34b07039b6d2b Mon Sep 17 00:00:00 2001
From: Michael Paquier
Date: Fri, 13 Jul 2012 13:38:02 +0900
Subject: Clean up remaining GIT conflicts due to merge a871778 in
 Makefile.shlib

Noticed by Andrew Wong
---
 src/Makefile.shlib | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 42d77d24ff..032982d30b 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -130,11 +130,7 @@ ifeq ($(PORTNAME), darwin)
     ifneq ($(SO_MAJOR_VERSION), 0)
       version_link	= -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
     endif
-<<<<<<< HEAD
-    LINK.shared		= $(COMPILER) -dynamiclib -install_name $(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) $(version_link) $(exported_symbols_list) -multiply_defined suppress -undefined suppress -flat_namespace
-=======
-    LINK.shared		= $(COMPILER) -dynamiclib -install_name '$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)' $(version_link) $(exported_symbols_list) -multiply_defined suppress
->>>>>>> c1d9579dd8bf3c921ca6bc2b62c40da6d25372e5
+    LINK.shared		= $(COMPILER) -dynamiclib -install_name '$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)' $(version_link) $(exported_symbols_list) -multiply_defined suppress -undefined suppress -flat_namespace
     shlib		= lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
     shlib_major		= lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
   else
-- 
cgit v1.2.3