summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/bmake/files/bmake.cat15
1 files changed, 1 insertions, 4 deletions
diff --git a/devel/bmake/files/bmake.cat1 b/devel/bmake/files/bmake.cat1
index 4cac6dd3d39..752aa7e011d 100644
--- a/devel/bmake/files/bmake.cat1
+++ b/devel/bmake/files/bmake.cat1
@@ -1166,7 +1166,4 @@ HHIISSTTOORRYY
bbmmaakkee is derived from NetBSD's make(1). It uses autoconf to facilitate
portability to other platforms.
-NetBSD 5.0 April 14, 2010 NetBSD 5.0
-=======
-NetBSD 5.0_STABLE April 21, 2010 NetBSD 5.0_STABLE
->>>>>>> 1.1.1.5
+NetBSD 5.0 April 21, 2010 NetBSD 5.0