summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-04-03 13:47:48 +0200
committerChristian Grothoff <christian@grothoff.org>2019-04-03 13:47:48 +0200
commit1c53d67c25a877901e5ff5a8421ccc5972751838 (patch)
treefabbbfcad3cacaf7dbab4a90d2c8f6810a750b54 /src
parent311795caa390858b627428629a6621def8949a7c (diff)
parent9f8374622c5b258cabb51b115a839d6cb2faeed6 (diff)
merge conflict resolution
Diffstat (limited to 'src')
-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,