[clouchdb-cvs] CVS clouchdb/src

[peddy]

Update of /project/clouchdb/cvsroot/clouchdb/src
In directory clnet:/tmp/cvs-serv15531/src

Modified Files:
	clouchdb.lisp 
Log Message:
Removed vc conflict junk


--- /project/clouchdb/cvsroot/clouchdb/src/clouchdb.lisp	2007/12/18 18:03:45	1.9
+++ /project/clouchdb/cvsroot/clouchdb/src/clouchdb.lisp	2007/12/18 18:09:53	1.10
@@ -218,23 +218,6 @@
 		      :uri (make-uri dbn)))))
        ,result)))
 
-<<<<<<< clouchdb.lisp
-;; (defmacro handle-doc-errors (&body body)
-;;   (let ((result (gensym)))
-;;     `(let ((,result (progn , at body)))
-;;        (when (document-property :error (,result))
-;;          (cond ((equal "conflict" (document-property :error result))
-;;                 (error 'id-or-revision-conflict 
-               
-<<<<<<< clouchdb.lisp
-;;
-;;
-;;
-
-=======
->>>>>>> 1.7
-=======
->>>>>>> 1.8
 (defun document-to-json (doc)
   "Convert document data, the top-level of wich is either an
   associative list or hashtable, to json data"