From 4fd10562c474ec13a932b51ed31bddbd5ffd28c4 Mon Sep 17 00:00:00 2001
From: "Arnold D. Robbins" <arnold@skeeve.com>
Date: Sat, 27 Oct 2012 21:51:20 +0200
Subject: Remove git merge droppings in m4 directory.

---
 m4/intl.m4 | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'm4/intl.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
-- 
cgit v1.2.3