[cells-cvs] CVS Celtk

[fgoenninger]

Update of /project/cells/cvsroot/Celtk
In directory clnet:/tmp/cvs-serv20152

Modified Files:
	Celtk.lisp 
Log Message:
CVS playing tricks on me... No change, really.

--- /project/cells/cvsroot/Celtk/Celtk.lisp	2006/05/28 23:45:03	1.27
+++ /project/cells/cvsroot/Celtk/Celtk.lisp	2006/05/28 23:47:24	1.28
@@ -16,7 +16,7 @@
 
 |#
 
-;;; $Header: /project/cells/cvsroot/Celtk/Celtk.lisp,v 1.27 2006/05/28 23:45:03 fgoenninger Exp $
+;;; $Header: /project/cells/cvsroot/Celtk/Celtk.lisp,v 1.28 2006/05/28 23:47:24 fgoenninger Exp $
 
 (defpackage :celtk
   (:nicknames "CTK")
@@ -134,7 +134,6 @@
       ;
       ; --- debug stuff ---------------------------------
       ;
-<<<<<<< Celtk.lisp
 ;;       (let ((yes '( "insert" "end"))
 ;;             (no  '()))
 ;;         (declare (ignorable yes no))
@@ -143,15 +142,6 @@
 ;;           (format t "~&tk> ~a~%" tk$))
 ;; 	  (break))
 ;;       (assert *tki*)
-=======
-      (let ((yes '( "insert"))
-            (no  '()))
-        (declare (ignorable yes no))
-        (when  (and (find-if (lambda (s) (search s tk$)) yes)
-                        (not (find-if (lambda (s) (search s tk$)) no)))
-          (format t "~&tk> ~a~%" tk$)))
-      (assert *tki*)
->>>>>>> 1.26
       ; --- end debug stuff ------------------------------
       ;
       ; --- serious stuff ---