Index: slime.texi
===================================================================
RCS file: /project/slime/cvsroot/slime/doc/slime.texi,v
retrieving revision 1.50
diff -u -r1.50 slime.texi
--- slime.texi	22 Nov 2006 06:27:38 -0000	1.50
+++ slime.texi	24 Dec 2006 10:52:04 -0000
@@ -1753,7 +1753,6 @@
 @end example
 
 @c ----------------------- 
-=======
 If you need to do anything particular
 (like be able to reconnect to swank after you're done), look into
 @code{swank:create-server}'s other arguments. Some of these arguments
@@ -1786,7 +1785,6 @@
 to connect to this lisp image from the same machine.
 
 
->>>>>>> 1.49
 @node Setting up Emacs
 @subsection Setting up Emacs