From e6c64fc035500bc098777e7687dc3da5b2aac35c Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 18 Oct 2018 16:27:54 +0200
Subject: fix merge artifact

---
 README | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'README')

diff --git a/README b/README
index 256a6c69c..14c00e3b1 100644
--- a/README
+++ b/README
@@ -75,30 +75,7 @@ These are the optional dependencies:
 - libgabe                           (optional, for Attribute-Based Encryption and Identity Provider functionality,
                                     from https://github.com/schanzen/libgabe)
 
-=======
-These are the direct dependencies for running GNUnet:
-
-- libmicrohttpd >= 0.9.52
-- libgcrypt     >= 1.6
-- libgnurl      >= 7.35.0 (available from https://gnunet.org/gnurl)
-- libunistring  >= 0.9.2
-- gnutls        >= 3.2.12
-- libidn        >= 1.0
-- libextractor  >= 0.6.1 (highly recommended)
-- openssl       >= 1.0 (binary, used to generate X.509 certificate)
-- libltdl       >= 2.2 (part of GNU libtool)
-- sqlite        >= 3.8 (default database, required)
-- mysql         >= 5.1 (alternative to sqlite)
-- postgres      >= 9.5 (alternative to sqlite)
-- libopus       >= 1.0.1 (optional for experimental conversation tool)
-- libpulse      >= 2.0 (optional for experimental conversation tool)
-- libogg        >= 1.3.0 (optional for experimental conversation tool)
-- python-zbar   >= 0.10 (optional for gnunet-qr)
-- TeX Live      >= 2012 (optional for gnunet-bcd[*])
-- Texinfo       >= 5.2 [*1]
-- libglpk       >= 4.45 (optional for experimental code)
-
-Recommended autotools for compiling the git version are:
+Recommended autotools for compiling the Git version are:
 
 - autoconf           >= 2.59
 - automake           >= 1.11.1
-- 
cgit v1.2.3