[slime-cvs] CVS update: slime/swank-openmcl.lisp

[Helmut Eller]

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

Modified Files:
	swank-openmcl.lisp 
Log Message:
Merge remove conficts

Date: Wed Mar 10 05:03:38 2004
Author: heller

Index: slime/swank-openmcl.lisp
diff -u slime/swank-openmcl.lisp:1.70 slime/swank-openmcl.lisp:1.71
--- slime/swank-openmcl.lisp:1.70	Tue Mar  9 14:35:36 2004
+++ slime/swank-openmcl.lisp	Wed Mar 10 05:03:38 2004
@@ -327,18 +327,10 @@
                               ((symbolp tag)
                                tag)
                               ((and (listp tag)
-<<<<<<< swank-openmcl.lisp
                                     (typep (car tag) 'restart))
                                `(:restart ,(restart-name (car tag))))))))))))
 
 (defimplementation disassemble-frame (the-frame-number)
-=======
-                                    (typep (car tag) 'restart))
-                               `(:restart ,(restart-name (car tag))))))))))))
-
-(defimplementation sldb-disassemble (the-frame-number)
-  "Return a string with the disassembly of frames code."
->>>>>>> 1.69
   (let ((function-to-disassemble nil))
     (block find-frame
       (map-backtrace