From cb97421f27c868b4c15c4bbdb2a567b06547fad6 Mon Sep 17 00:00:00 2001
From: David Aspinall
Date: Sun, 5 Oct 2003 16:23:20 +0000
Subject: Remove CVS junk

---
 html/develdownload.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'html')

diff --git a/html/develdownload.php b/html/develdownload.php
index b7155a64..e659f197 100644
--- a/html/develdownload.php
+++ b/html/develdownload.php
@@ -76,7 +76,6 @@ version, and notes about work-in-progress.  </p>
 <!-- End Warning. -->
 <p> 
 <b>Emacs versions:</b>
-<<<<<<< develdownload.php
 This version has been tested with XEmacs version 21.4.12 and with GNU
 Emacs 21.2.1.  XEmacs support is better tested, although use under
 GNU Emacs has certain advantages (e.g., nested comments!).  Please check
-- 
cgit v1.2.3