aboutsummaryrefslogtreecommitdiffstats
path: root/m4/po.m4
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2012-10-27 21:51:20 +0200
committerArnold D. Robbins <arnold@skeeve.com>2012-10-27 21:51:20 +0200
commit4fd10562c474ec13a932b51ed31bddbd5ffd28c4 (patch)
tree7bfbf1cf1a8b95a142d317e01b46185469ea3861 /m4/po.m4
parent4a267501525be3157b0d41e9030e9d4a9c7f5897 (diff)
downloadegawk-4fd10562c474ec13a932b51ed31bddbd5ffd28c4.tar.gz
egawk-4fd10562c474ec13a932b51ed31bddbd5ffd28c4.tar.bz2
egawk-4fd10562c474ec13a932b51ed31bddbd5ffd28c4.zip
Remove git merge droppings in m4 directory.
Diffstat (limited to 'm4/po.m4')
-rw-r--r--m4/po.m44
1 files changed, 0 insertions, 4 deletions
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