Skip to content

Commit

Permalink
Fixed imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@JoBuRo
JoBuRo committed Aug 24, 2018
1 parent 7acd208 commit a04ec39
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 31 deletions.
6 changes: 6 additions & 0 deletions TNMO/TNM-O.owl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ Institute of Medical Informatics, Statistics and Documentation, Medical Universi



<!-- http://purl.org/biotop/btl2.owl#isRepresentedBy -->

<owl:AnnotationProperty rdf:about="http://purl.org/biotop/btl2.owl#isRepresentedBy"/>



<!-- http://swrl.stanford.edu/ontologies/3.3/swrla.owl#isRuleEnabled -->

<owl:AnnotationProperty rdf:about="http://swrl.stanford.edu/ontologies/3.3/swrla.owl#isRuleEnabled"/>
Expand Down
33 changes: 2 additions & 31 deletions TNMO/catalog-v001.xml
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<<<<<<< HEAD
<uri id="Imports Wizard Entry" name="http://putl.org/tnmo/TNMO_LiverTest/1.0" uri="TNMO8/liverTest.owl"/>
<uri id="Imports Wizard Entry" name="http://purl.org/tnmo/TNM-O_Liver" uri="TNMO8/liver.owl"/>
<uri id="Imports Wizard Entry" name="http://purl.org/tnmo/TNM-O_Stomach_Test" uri="TNMO8/stomachTest.owl"/>
<uri id="Imports Wizard Entry" name="http://purl.org/tnmo/TNM-O_Stomach" uri="TNMO8/stomach.owl"/>
<uri id="Imports Wizard Entry" name="http://purl.org/tnmo/TNM-O_Anatomy.owl/1" uri="TNM-O_Anatomy.owl"/>
<uri id="Imports Wizard Entry" name="http://purl.org/biotop/btl2.owl" uri="btl2.owl"/>
<group id="Folder Repository, directory=, recursive=true, Auto-Update=false, version=2" prefer="public" xml:base=""/>
||||||| merged common ancestors
<uri id="User Entered Import Resolution" name="http://purl.org/tnmo/TNM-O_Liver" uri="TNMO8/liver.owl"/>
<uri id="User Entered Import Resolution" name="http://purl.org/tnmo/TNM-O_Anatomy.owl/1" uri="TNM-O_Anatomy.owl"/>
<group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base="">
<uri id="Automatically generated entry, Timestamp=1527759167812" name="http://purl.org/biotop/btl2.owl" uri="btl2.owl"/>
<uri id="Automatically generated entry, Timestamp=1527759167812" name="http://purl.org/tnmo/TNM-O" uri="TNMO7/breast.owl"/>
<uri id="Automatically generated entry, Timestamp=1527759167812" name="http://purl.org/tnmo/TNM-O.owl" uri="TNM-O.owl"/>
<uri id="Automatically generated entry, Timestamp=1527759167812" name="http://purl.org/tnmo/TNM-O_Anatomy.owl" uri="TNM-O_Anatomy.owl"/>
<uri id="Automatically generated entry, Timestamp=1527759167812" name="http://purl.org/tnmo/TNM-O_colorectal_7.owl" uri="TNMO7/colorectal.owl"/>
<uri id="Automatically generated entry, Timestamp=1527759167812" name="http://purl.org/tnmo/TNM-O_lung_7.owl" uri="TNMO7/lung.owl"/>
<uri id="Automatically generated entry, Timestamp=1527759167812" name="http://www.semanticweb.org/thoma/ontologies/2018/3/liver" uri="TNMO8/liver.owl"/>
</group>
=======
<uri id="User Entered Import Resolution" name="http://purl.org/tnmo/TNM-O_Liver" uri="TNMO8/liver.owl"/>
<uri id="User Entered Import Resolution" name="http://purl.org/tnmo/TNM-O_Anatomy.owl/1" uri="TNM-O_Anatomy.owl"/>
<group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base="">
<uri id="Automatically generated entry, Timestamp=1530904452812" name="http://purl.org/biotop/btl2.owl" uri="btl2.owl"/>
<uri id="Automatically generated entry, Timestamp=1530904452812" name="http://purl.org/tnmo/TNM-O" uri="TNMO7/breast.owl"/>
<uri id="Automatically generated entry, Timestamp=1530904452812" name="http://purl.org/tnmo/TNM-O.owl" uri="TNM-O.owl"/>
<uri id="Automatically generated entry, Timestamp=1530904452812" name="http://purl.org/tnmo/TNM-O_Anatomy.owl" uri="TNM-O_Anatomy.owl"/>
<uri id="Automatically generated entry, Timestamp=1530904452812" name="http://purl.org/tnmo/TNM-O_Stomach" uri="TNMO8/stomach.owl"/>
<uri id="Automatically generated entry, Timestamp=1530904452812" name="http://purl.org/tnmo/TNM-O_colorectal_7.owl" uri="TNMO7/colorectal.owl"/>
<uri id="Automatically generated entry, Timestamp=1530904452812" name="http://purl.org/tnmo/TNM-O_lung_7.owl" uri="TNMO7/lung.owl"/>
<uri id="Automatically generated entry, Timestamp=1530904452812" name="http://www.semanticweb.org/thoma/ontologies/2018/3/liver" uri="TNMO8/liver.owl"/>
</group>
>>>>>>> c5629883742eb6cec993bace51d5ea16a2e3df9f
</catalog>

0 comments on commit a04ec39

Please sign in to comment.