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