[slime-cvs] CVS update: slime/doc/slime.texi

[Luke Gorrie]

Update of /project/slime/cvsroot/slime/doc
In directory common-lisp.net:/tmp/cvs-serv27146

Modified Files:
	slime.texi 
Log Message:
Removed some CVS conflict markers.

Date: Fri Sep 24 01:17:43 2004
Author: lgorrie

Index: slime/doc/slime.texi
diff -u slime/doc/slime.texi:1.30 slime/doc/slime.texi:1.31
--- slime/doc/slime.texi:1.30	Fri Sep 17 15:01:01 2004
+++ slime/doc/slime.texi	Fri Sep 24 01:17:43 2004
@@ -45,13 +45,8 @@
 @code{\command\}@*
 @end macro
 
-<<<<<<< slime.texi
 @set EDITION 1.0
- at set UPDATED @code{$Date: 2004/09/17 13:01:01 $}
-=======
- at set EDITION 1.0
- at set UPDATED @code{$Date: 2004/09/17 13:01:01 $}
->>>>>>> 1.28
+ at set UPDATED @code{$Date: 2004/09/23 23:17:43 $}
 
 @titlepage
 @title SLIME User Manual