[gawk-diffs] [SCM] gawk branch, master, updated. 4fd10562c474ec13a932b51ed31bddbd5ffd28c4

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, master has been updated
       via  4fd10562c474ec13a932b51ed31bddbd5ffd28c4 (commit)
      from  4a267501525be3157b0d41e9030e9d4a9c7f5897 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=4fd10562c474ec13a932b51ed31bddbd5ffd28c4

commit 4fd10562c474ec13a932b51ed31bddbd5ffd28c4
Author: Arnold D. Robbins <address@hidden>
Date:   Sat Oct 27 21:51:20 2012 +0200

    Remove git merge droppings in m4 directory.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 8c64cfb..8489f90 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-27         Arnold D. Robbins     <address@hidden>
+
+       * po.m4, intl.m4: Fix droppings left over from a git merge.
+
 2012-05-21         Andrew J. Schorr     <address@hidden>
 
        * libtool.m4, ltoptions.m4, ltsugar.m4, ltversion.m4, lt~obsolete.m4:
diff --git a/m4/intl.m4 b/m4/intl.m4
index f528e4e..d18cc01 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 fe8b063..2c9532f 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

-----------------------------------------------------------------------

Summary of changes:
 m4/ChangeLog |    4 ++++
 m4/intl.m4   |    4 ----
 m4/po.m4     |    4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
gawk