[slime-cvs] CVS update: slime/ChangeLog

[Luke Gorrie]

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

Modified Files:
	ChangeLog 
Log Message:

Date: Wed Feb  2 04:12:33 2005
Author: lgorrie

Index: slime/ChangeLog
diff -u slime/ChangeLog:1.608 slime/ChangeLog:1.609
--- slime/ChangeLog:1.608	Wed Feb  2 04:09:36 2005
+++ slime/ChangeLog	Wed Feb  2 04:12:33 2005
@@ -80,7 +80,6 @@
 	(arglist-for-insertion): Use it
 	(decode-keyword-arg, decode-optional-arg): New functions.
 	
->>>>>>> 1.607
 2005-01-19  Lars Magne Ingebrigtsen  <larsi at gnus.org>
 
 	* slime.el (slime-header-line-p): Customize variable to