1 files changed, 0 insertions, 4 deletions

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