projects / lttng-tools.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix merge with master
[lttng-tools.git] / src / bin / lttng-sessiond / Makefile.am
diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am
index bc99f9b4a4e8d660fe9680e2543ee4dd12d32740..24ac2b889f2af44a420cede6cef063e71ab14859 100644 (file)
--- 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)"\"
LTTng 2.0 tools and control repository
This page took 0.023557 seconds and 4 git commands to generate.