[src/trunk]: src/gnu/dist/gettext Resolve some more conflicts.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5f07f82d4338
branches:  trunk
changeset: 580922:5f07f82d4338
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon May 16 02:11:04 2005 +0000

description:
Resolve some more conflicts.

diffstat:

 gnu/dist/gettext/Makefile.in |  21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)

diffs (31 lines):

diff -r eebbc140e449 -r 5f07f82d4338 gnu/dist/gettext/Makefile.in
--- a/gnu/dist/gettext/Makefile.in      Mon May 16 00:45:24 2005 +0000
+++ b/gnu/dist/gettext/Makefile.in      Mon May 16 02:11:04 2005 +0000
@@ -581,27 +581,6 @@
        mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
        uninstall uninstall-am uninstall-info-am
 
-<<<<<<< Makefile.in
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-uninstall-gettextsrcDATA install-gettextsrcDATA install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck all-recursive-am all-am install-data-am uninstall-am \
-install-exec install-data install uninstall all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-#ABOUT-NLS: $(srcdir)/doc/nls.texi $(srcdir)/doc/matrix.texi
-#      rm -f $(srcdir)/ABOUT-NLS \
-#        && $(MAKEINFO) --output=$(srcdir)/ABOUT-NLS --no-header \
-#          -I $(srcdir)/doc --no-validate nls.texi
-=======
->>>>>>> 1.1.1.2
 
 # Additional dependencies for configure, due to the use of autoconf --trace.
 $(srcdir)/configure: $(srcdir)/autoconf-lib-link/configure.ac $(srcdir)/gettext-runtime/configure.ac $(srcdir)/gettext-tools/configure.ac