===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/29.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- www/29.html	2001/04/30 21:59:35	1.14
+++ www/29.html	2001/05/01 11:15:24	1.15
@@ -98,18 +98,10 @@
 <li>The system includes the following major components from outside suppliers:
 <p>
 <ul>
-<<<<<<< 29.html
-<li>XFree86 4.0.3 (and i386 contains 3.3.X servers also, thus providing support
-for all chipsets)
-<li>gcc 2.95.3 (+ patches)
-<li>perl 5.6.0 plus a few fixes.
-<li>Apache 1.3.19 (+ patches), mod_ssl 2.8.1, OpenSSL 0.9.5a, DSO support
-=======
 <li>XFree86 4.0.3 (and i386 contains 3.3.X servers also, thus providing support for all chipsets)
 <li>gcc 2.95.3 (+ patches)
 <li>perl 5.6.0 (+ patches)
 <li>Apache 1.3.19, mod_ssl 2.8.2, OpenSSL 0.9.6 (+ patches), DSO support
->>>>>>> 1.13
 <li>ipf 3.4.16 (+ patches)
 <li>groff 1.15
 <li>sendmail 8.11.3
@@ -387,7 +379,7 @@
 <hr>
 <a href="index.html"><img height=24 width=24 src=back.gif border=0 alt=OpenBSD></a> 
 <a href=mailto:www@openbsd.org>www@openbsd.org</a>
-<br><small>$OpenBSD: 29.html,v 1.14 2001/04/30 21:59:35 espie Exp $</small>
+<br><small>$OpenBSD: 29.html,v 1.15 2001/05/01 11:15:24 espie Exp $</small>
 
 </body>
 </html>