Mercurial > hg > octave-nkf > gnulib-hg

changeset 2156:899ef9ad5cc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
.
author Jim Meyering <jim@meyering.net>
date Wed, 19 Jan 2000 08:17:47 +0000
parents 96804843a1eb
children 90b2c7c64ac1
files m4/Makefile.in
diffstat 1 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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@