--- a/ontology/components/wasInformedBy/prov-dm-constraint-wasInformedBy.ttl	Wed Nov 16 14:32:56 2011 +0000
+++ b/ontology/components/wasInformedBy/prov-dm-constraint-wasInformedBy.ttl	Thu Nov 17 11:29:28 2011 -0500
@@ -10,7 +10,16 @@
 @prefix :    <http://www.w3.org/TR/2011/WD-prov-dm-20111018/#> .
 
 :pe2
+<<<<<<< local
+   rdfs:seeAlso <http://www.w3.org/TR/2011/WD-prov-dm-20111018/#expression-OrderingOfProcessExecutions>,
+                <http://dvcs.w3.org/hg/prov/raw-file/default/model/ProvenanceModel.html#record-OrderingOfActivities>,
+                <https://dvcs.w3.org/hg/prov/raw-file/06d757eed9d5/ontology/components/wasInformedBy/prov-dm-constraint-wasInformedBy.png>;
+   dcterms:description
+"""Given two activity records identified by pe1 and pe2, the record wasInformedBy(pe2,pe1) holds, if and only if there is an entity record identified by e and sets of attribute-value pairs attrs1 and attrs2, such that wasGeneratedBy(e,pe1,attrs1) and used(pe2,e,attrs2) hold.""";
+
+=======
    rdfs:seeAlso <http://www.w3.org/TR/2011/WD-prov-dm-20111018/#expression-OrderingOfProcessExecutions>;
+>>>>>>> other
    dcterms:description "wasInformedBy(pe2,pe1)";
    a prov:ProcessExecution;
    prov:wasInformedBy :pe1;
@@ -50,3 +59,5 @@
       rdfs:comment "Some addition triples should be here, but are not provided by the PROV-DM example.";
    ];
 .
+
+<https://dvcs.w3.org/hg/prov/raw-file/06d757eed9d5/ontology/components/wasInformedBy/prov-dm-constraint-wasInformedBy.png> prov:wasDerivedFrom <https://dvcs.w3.org/hg/prov/raw-file/06d757eed9d5/ontology/components/wasInformedBy/prov-dm-constraint-wasInformedBy.ttl> .