--- a/ontology/ProvenanceOntology.owl	Wed Sep 07 18:43:40 2011 -0400
+++ b/ontology/ProvenanceOntology.owl	Wed Sep 07 18:47:47 2011 -0400
@@ -94,8 +94,6 @@
     <owl:ObjectProperty rdf:about="#isParticipantIn">
         <rdf:type rdf:resource="&owl;AsymmetricProperty"/>
         <rdf:type rdf:resource="&owl;IrreflexiveProperty"/>
-        <rdfs:domain rdf:resource="#Entity"/>
-        <rdfs:range rdf:resource="#ProcessExecution"/>
     </owl:ObjectProperty>
     
 
@@ -112,29 +110,6 @@
     
 
 
-<<<<<<< local
-=======
-    <!-- 
-    ///////////////////////////////////////////////////////////////////////////////////////
-    //
-    // Data properties
-    //
-    ///////////////////////////////////////////////////////////////////////////////////////
-     -->
-
-    
-
-
-    <!-- http://w3.org/ProvenanceOntology.owl#ab -->
-
-    <owl:DatatypeProperty rdf:about="#ab">
-        <rdfs:domain rdf:resource="#Entity"/>
-        <rdfs:range rdf:resource="&xsd;string"/>
-    </owl:DatatypeProperty>
-    
-
-
->>>>>>> other
     <!-- 
     ///////////////////////////////////////////////////////////////////////////////////////
     //
@@ -215,32 +190,6 @@
         <rdfs:label rdf:datatype="&xsd;string"
             >Time represents temporal information about entities in the Provenance model.</rdfs:label>
     </owl:Class>
-    
-
-
-    <!-- http://www.w3.org/2002/07/owl#Thing -->
-
-    <owl:Class rdf:about="&owl;Thing"/>
-    
-
-
-    <!-- 
-    ///////////////////////////////////////////////////////////////////////////////////////
-    //
-    // Individuals
-    //
-    ///////////////////////////////////////////////////////////////////////////////////////
-     -->
-
-    
-
-
-    <!-- http://w3.org/ProvenanceOntology.owl#s -->
-
-    <Entity rdf:about="#s">
-        <rdf:type rdf:resource="&owl;Thing"/>
-        <ab rdf:datatype="&xsd;string">file.txt</ab>
-    </Entity>
 </rdf:RDF>