X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2FMakefile.am;h=24ac2b889f2af44a420cede6cef063e71ab14859;hb=b060669ea977dcb69d9923fa55d116358b926c6e;hp=bc99f9b4a4e8d660fe9680e2543ee4dd12d32740;hpb=de003c688dc5a05650a45a2fa2b8e946b9aac61b;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am
index bc99f9b4a..24ac2b889 100644
--- a/src/bin/lttng-sessiond/Makefile.am
+++ b/src/bin/lttng-sessiond/Makefile.am
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 AM_CPPFLAGS = -I$(top_srcdir)/benchmark \
 			  -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
 			  -DINSTALL_LIB_PATH=\""$(libdir)"\"