[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 01/01: gnurl: clean up merge.
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnurl] 01/01: gnurl: clean up merge. |
|
Date: |
Tue, 22 Aug 2017 18:22:45 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7_55_1-2
in repository gnurl.
commit 99cd5603a157191c4593f61b16ee381d712e83f0
Author: ng0 <address@hidden>
AuthorDate: Tue Aug 22 16:21:54 2017 +0000
gnurl: clean up merge.
Signed-off-by: ng0 <address@hidden>
---
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