merge conflict resolution

2 files changed, 0 insertions, 8 deletions

diff --git a/README b/README
index 1d31a0a6a..1841bb616 100644
--- a/README
+++ b/README
@@ -134,8 +134,6 @@ These are the optional dependencies:
                                      html output of man pages)
 - miniupnpc
 - perl5                             (for some utilities)
-- python2.7          = 2.7          (for gnunet-qr, only python 2.7
-                                     supported)
 - TeX Live           >= 2012        (for gnunet-bcd[*])
 - texi2mdoc                         (for automatic mdoc generation [*2])
 
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,