Merge remote-tracking branch 'upstream/master'

BFO-ontology · Jan 7, 2024 · d171d14 · d171d14
2 parents 7e8661c + 3653163
commit d171d14
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/21838-2/bfo-2020-terms.xlsx b/21838-2/bfo-2020-terms.xlsx
diff --git a/src/common logic/spatial.cl b/src/common logic/spatial.cl
@@ -204,4 +204,4 @@ This work is licensed under a Creative Commons "Attribution 4.0 International" l
             (and (not (= rprime r)) (continuant-part-of rprime r t2)
              (occupies-spatial-region c rprime t2)))))))))))
 
-)))
+)))
diff --git a/src/common logic/universal-declaration.cl b/src/common logic/universal-declaration.cl
@@ -1292,4 +1292,4 @@ This work is licensed under a Creative Commons "Attribution 4.0 International" l
        (and (instance-of x two-dimensional-spatial-region t)
         (instance-of x three-dimensional-spatial-region t))))))
 
-)))
+)))
-Original file line number
+Diff line change
@@ Expand Up @@
                 (and (not (= rprime r)) (continuant-part-of rprime r t2)
                  (occupies-spatial-region c rprime t2)))))))))))
-    )))
+    )))