summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@infotropique.org>2017-08-22 16:21:54 +0000
committerng0 <ng0@infotropique.org>2017-08-22 16:21:54 +0000
commit99cd5603a157191c4593f61b16ee381d712e83f0 (patch)
tree7a0f2f05a7055bdf1345461656132ff0b3156604
parent20f7f90142ebc0d63886e0879839edcd1d84b4e6 (diff)
downloadgnurl-99cd5603a157191c4593f61b16ee381d712e83f0.tar.gz
gnurl-99cd5603a157191c4593f61b16ee381d712e83f0.tar.bz2
gnurl-99cd5603a157191c4593f61b16ee381d712e83f0.zip
gnurl: clean up merge.gnurl-7_55_1-2
Signed-off-by: ng0 <ng0@infotropique.org>
-rw-r--r--src/Makefile.am1
1 files changed, 0 insertions, 1 deletions
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