From bc77979dc143aa694b8ebc69ff3fe68dd982c59a Mon Sep 17 00:00:00 2001
From: "Lev A. Serebryakov" <lev@FreeBSD.org>
Date: Sat, 10 Apr 2004 19:23:24 +0000
Subject:  Ooops... Garbaged makefile was committed. I'm very sorry about this.
  Fixed.

---
 devel/apr/Makefile | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'devel/apr')

diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 31febb4fbac7..d6dbcdc3f663 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -45,13 +45,6 @@ APR_UTIL_CONF_ARGS=	--with-apr=../apr-${PORTVERSION} \
 
 .include <bsd.port.pre.mk>
 
-<<<<<<< Makefile
-#.if ${OSVERSION} < 500000
-#BROKEN=		"Configure fails on 4.x"
-#.endif
-
-=======
->>>>>>> 1.37
 .if defined(APR_UTIL_WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--disable-threads
 APR_UTIL_CONF_ARGS+=	--disable-threads
-- 
cgit v1.2.3