# HG changeset patch
# User Jim Meyering <jim@meyering.net>
# Date 948269867 0
# Node ID 899ef9ad5cc8ed148c8fcd7565fc2fce581bf840
# Parent  96804843a1eb2bb2b7724c24b80eb18a4fd35f51
.

diff --git a/m4/Makefile.in b/m4/Makefile.in
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -91,13 +91,9 @@
 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@