anchor.diff:  ;;    %SuperClass;>
   (defun encode-cimxml-class (class)
     (declare (type cim-class-declaration class))
  -<<<<<<< HEAD
     (let ((super-class (cim-class-declaration-superclass class)))
  -=======
  -  (let ((super-class (cim-class-superclasses class)))
  ->>>>>>> 02939a2ceb4aa21517ae0cea0123d09fc62ece59
   	(if super-class
   	    (eformat "<CLASS NAME=\"~A\" SUPERCLASS=\"~A\">~%"
   		     (cim-name class)
  
positive.code: (defun encode-cimxml-slot (slot &optional value)
    (if (listp slot)
        (destructuring-bind (slot-name slot-value slot-type) slot
  <<<<<<< HEAD
  	(encode-cimxml-slot* slot-name slot-value slot-type))
        (let ((type (cim-slot-type slot)))
  	(cond
  
negative.code: 	(destructuring-bind (q . v) qualifier
  	  (encode-cimxml-qualifier q v)))
    (dolist (slot (cim-class-declaration-slots class))
  	(encode-cimxml-slot slot))
    (dolist (method (cim-class-declaration-methods class))
  	(encode-cimxml-method method))
    (eformat "</CLASS>~%"))
  