[GNUnet-SVN] [gnurl] branch master updated (20f7f9014 -> 99cd5603a)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository gnurl.

    from 20f7f9014 Patchset for gnURL microfork: * Patches to rename libcurl to 
libgnurl by Christian * Updated for latest curl using git cherry-pick by Jeff, 
Florian, ng0 * Patches to fix the testsuite (deleted tests/data/test1139, 
renamed reference from libcurl.* to libgnurl.*) by ng0 * Added guix-gnurl.scm 
which can be used to build this with guix prior to installing it. (author: ng0) 
* Further adjustments by ng0 * 7.55.0: Manual addition of 
a7bbbb7c368c6096802007f61f19a02e9d75285b and [...]
     add 99cd5603a gnurl: clean up merge.

No new revisions were added by this update.

Summary of changes:
 src/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 63df6ddc3..a6bab6bdc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,7 +96,6 @@ EXTRA_DIST = mkhelp.pl makefile.dj Makefile.b32               
\
 # Use absolute directory to disable VPATH
 MANPAGE=$(abs_top_builddir)/docs/gnurl.1
 
->>>>>>> Patchset for gnURL microfork:
 README=$(top_srcdir)/docs/MANUAL
 MKHELP=$(top_srcdir)/src/mkhelp.pl
 HUGE=tool_hugehelp.c

-- 
To stop receiving notification emails like this one, please contact
address@hidden