diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-04-03 13:47:48 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-04-03 13:47:48 +0200 |
commit | 1c53d67c25a877901e5ff5a8421ccc5972751838 (patch) | |
tree | fabbbfcad3cacaf7dbab4a90d2c8f6810a750b54 | |
parent | 311795caa390858b627428629a6621def8949a7c (diff) | |
parent | 9f8374622c5b258cabb51b115a839d6cb2faeed6 (diff) | |
download | gnunet-1c53d67c25a877901e5ff5a8421ccc5972751838.tar.gz gnunet-1c53d67c25a877901e5ff5a8421ccc5972751838.zip |
merge conflict resolution
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | src/util/Makefile.am | 6 |
2 files changed, 0 insertions, 8 deletions
@@ -134,8 +134,6 @@ These are the optional dependencies: | |||
134 | html output of man pages) | 134 | html output of man pages) |
135 | - miniupnpc | 135 | - miniupnpc |
136 | - perl5 (for some utilities) | 136 | - perl5 (for some utilities) |
137 | - python2.7 = 2.7 (for gnunet-qr, only python 2.7 | ||
138 | supported) | ||
139 | - TeX Live >= 2012 (for gnunet-bcd[*]) | 137 | - TeX Live >= 2012 (for gnunet-bcd[*]) |
140 | - texi2mdoc (for automatic mdoc generation [*2]) | 138 | - texi2mdoc (for automatic mdoc generation [*2]) |
141 | 139 | ||
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 = \ | |||
668 | test_program_data.conf \ | 668 | test_program_data.conf \ |
669 | test_resolver_api_data.conf \ | 669 | test_resolver_api_data.conf \ |
670 | test_service_data.conf \ | 670 | test_service_data.conf \ |
671 | <<<<<<< HEAD | ||
672 | test_speedup_data.conf \ | ||
673 | gnunet-qr.in \ | ||
674 | gnunet-qr.py | ||
675 | ======= | ||
676 | test_speedup_data.conf | 671 | test_speedup_data.conf |
677 | >>>>>>> gnunet-qr: Add into Makefile.am and pofiles, | ||