X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=DO_NO_MERGE.txt;fp=DO_NO_MERGE.txt;h=0c57f8d93daf533a2bee922f8bd851d3120ce53f;hp=0000000000000000000000000000000000000000;hb=2463b7879c00298daa79744cdaae82ac061a4ed8;hpb=3a4595c2469472dee1656cde5f8882c2123efd3c

diff --git a/DO_NO_MERGE.txt b/DO_NO_MERGE.txt
new file mode 100644
index 000000000..0c57f8d93
--- /dev/null
+++ b/DO_NO_MERGE.txt
@@ -0,0 +1,2 @@
+captures
+trigger error counter