commit ea5fb9f6fd4c19c70e91dfdab6c1462cc5457171
author Leif Hedstrom <zwoop@apache.org> Tue Mar 25 21:23:03 2014 -0600
committer Leif Hedstrom <zwoop@apache.org> Tue Mar 25 21:23:03 2014 -0600
tree d87c9b1233f94e63cdba328d2409b1a6ffdc6dd6
parent c5c92b9491f3172e5f600502df65b1a99a2e535e

x

proxy/Makefile.am

diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 1056784..bd5aeba 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -251,14 +251,9 @@
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/records/librecprocess.a \
   $(top_builddir)/lib/ts/libtsutil.la \
-<<<<<<< HEAD
-  @LUA_LIBS@ \
-  @LIBRESOLV@ @LIBPCRE@ @LIBSSL@ @LIBTCL@ \
-  @LIBEXPAT@ @LIBDEMANGLE@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ -lm
-=======
   @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @hwloc_LIBS@ \
-  @LIBEXPAT@ @LIBDEMANGLE@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ @SPDYLAY_LIBS@ -lm
->>>>>>> origin/master
+  @LIBEXPAT@ @LIBDEMANGLE@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ @SPDYLAY_LIBS@ -lm \
+  @LUA_LIBS@
 
 if BUILD_TESTS
   traffic_sac_SOURCES += RegressionSM.cc