.

diff --git a/m4/Makefile.in b/m4/Makefile.in
index cc72afb1c471ba87e8adff014ffcfa669a5f86ec..fe4236425637451a85ea360b324a27e3c554518c 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -91,13 +91,9 @@ MAKEINFO = @MAKEINFO@
 MAN = @MAN@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-<<<<<<< Makefile.in
 NEED_SETGID = @NEED_SETGID@
 OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@
 OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@
-=======
-NEED_SETGID = @NEED_SETGID@
->>>>>>> 1.216
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POFILES = @POFILES@