From cee6fe7563d96f028c6e9343a81e24f9c7f70296 Mon Sep 17 00:00:00 2001
From: delphij <delphij@FreeBSD.org>
Date: Mon, 8 Oct 2007 16:17:42 +0000
Subject: Resolve conflicts to complete less v408 import.

Approved by:	re (kensmith)
---
 release/doc/en_US.ISO8859-1/relnotes/article.sgml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'release')

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 6d4b39a..60a65d2 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -2314,7 +2314,7 @@ mdconfig_md1="-t vnode -f /var/foo.img"</programlisting>
       4.1.8 to 4.1.23.</para>
 
     <para><application>less</application> has been updated from v381
-      to v406. &merged;</para>
+      to v408.</para>
 
     <para><application>libpcap</application> has been updated from
       0.9.1 to 0.9.4. &merged;</para>
-- 
cgit v1.1