From 4fd10562c474ec13a932b51ed31bddbd5ffd28c4 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Sat, 27 Oct 2012 21:51:20 +0200 Subject: Remove git merge droppings in m4 directory. --- m4/ChangeLog | 4 ++++ m4/intl.m4 | 4 ---- m4/po.m4 | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) (limited to 'm4') diff --git a/m4/ChangeLog b/m4/ChangeLog index 8c64cfb5..8489f90e 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2012-10-27 Arnold D. Robbins + + * po.m4, intl.m4: Fix droppings left over from a git merge. + 2012-05-21 Andrew J. Schorr * libtool.m4, ltoptions.m4, ltsugar.m4, ltversion.m4, lt~obsolete.m4: diff --git a/m4/intl.m4 b/m4/intl.m4 index f528e4e6..d18cc01f 100644 --- a/m4/intl.m4 +++ b/m4/intl.m4 @@ -25,11 +25,7 @@ dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. AC_DEFUN([AM_INTL_SUBDIR], [ AC_REQUIRE([AC_PROG_INSTALL])dnl -<<<<<<< HEAD - AC_REQUIRE([AC_PROG_MKDIR])dnl defined by automake -======= AC_REQUIRE([AC_PROG_MKDIR_P])dnl ->>>>>>> gawk-4.0-stable AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([gt_GLIBC2])dnl diff --git a/m4/po.m4 b/m4/po.m4 index fe8b0637..2c9532f0 100644 --- a/m4/po.m4 +++ b/m4/po.m4 @@ -24,11 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS], [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl -<<<<<<< HEAD - AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake -======= AC_REQUIRE([AC_PROG_MKDIR_P])dnl ->>>>>>> gawk-4.0-stable AC_REQUIRE([AM_NLS])dnl dnl Release version of the gettext macros. This is used to ensure that -- cgit v1.2.1