summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2000-01-19 08:17:47 +0000
committerJim Meyering <jim@meyering.net>2000-01-19 08:17:47 +0000
commitddcb373abcdfb740849f60c2046777df12a905d6 (patch)
treeb26b3eb5536cb251ed2dce28cd9d829e97513161 /m4
parente0a66a6600811ee724985cf5fdc8b34d12acb1dc (diff)
downloadcoreutils-ddcb373abcdfb740849f60c2046777df12a905d6.tar.xz
.
Diffstat (limited to 'm4')
-rw-r--r--m4/Makefile.in4
1 files changed, 0 insertions, 4 deletions
diff --git a/m4/Makefile.in b/m4/Makefile.in
index cc72afb1c..fe4236425 100644
--- 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@