summaryrefslogtreecommitdiff
path: root/src/util/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'src/util/Makefile.am')
-rw-r--r--src/util/Makefile.am6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index a5a7ff288..89d0462c5 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -668,10 +668,4 @@ EXTRA_DIST = \
test_program_data.conf \
test_resolver_api_data.conf \
test_service_data.conf \
-<<<<<<< HEAD
- test_speedup_data.conf \
- gnunet-qr.in \
- gnunet-qr.py
-=======
test_speedup_data.conf
->>>>>>> gnunet-qr: Add into Makefile.am and pofiles,