aboutsummaryrefslogtreecommitdiff
path: root/html
diff options
context:
space:
mode:
authorDavid Aspinall2003-10-05 16:23:20 +0000
committerDavid Aspinall2003-10-05 16:23:20 +0000
commitcb97421f27c868b4c15c4bbdb2a567b06547fad6 (patch)
tree205d2c41c4620530ade2debfd8ab08a593345c2d /html
parentcf5a21992b704bd9a815407f9bf863dba2d8a5f3 (diff)
Remove CVS junk
Diffstat (limited to 'html')
-rw-r--r--html/develdownload.php1
1 files changed, 0 insertions, 1 deletions
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