Commit 2379b241 authored by remivantrijp's avatar remivantrijp
Browse files

Error subrepo

parent f97ccb72
......@@ -88,28 +88,4 @@
(setf (left-pole-structure transient-structure)
(append (left-pole-structure transient-structure) new-units))
(set-data transient-structure :dependency-tree dependency-tree)
<<<<<<< HEAD
transient-structure))
;; 2- Dependency conversion tables.
;; ------------------------------------------------------------------------------------------------
(export '(fcg-get-dependency-conversion-table fcg-set-dependency-conversion-table))
(defgeneric retrieve-category-from-conversion-table (category-name conversion-table))
(defmethod retrieve-category-from-conversion-table ((category-name t)
(conversion-table list))
(second (assoc category-name conversion-table)
:test #'equal))
(defun fcg-get-dependency-conversion-table (&optional cxn-inventory)
(or (when cxn-inventory (get-configuration cxn-inventory :dependency-conversion-table))
t)) ;; At least always return T.
(defun fcg-set-dependency-conversion-table (cxn-inventory data)
(set-configuration cxn-inventory :dependency-conversion-table data))
=======
transient-structure))
>>>>>>> refs/subrepo/systems/fcg-hybrids/fetch
transient-structure))
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment