Showing
1 changed file
with
13 additions
and
0 deletions
| 1 | +<<<<<<< Updated upstream | ||
| 1 | # Saved by TopBraid on Mon Oct 10 20:47:57 BST 2011 | 2 | # Saved by TopBraid on Mon Oct 10 20:47:57 BST 2011 |
| 3 | +======= | ||
| 4 | +# Saved by TopBraid on Mon Oct 10 20:43:39 BST 2011 | ||
| 5 | +>>>>>>> Stashed changes | ||
| 2 | # baseURI: http://www.reportinghub.no/ep/schema/1.0/production-report | 6 | # baseURI: http://www.reportinghub.no/ep/schema/1.0/production-report |
| 3 | # imports: http://www.reportinghub.no/ep/schema/1.0/report | 7 | # imports: http://www.reportinghub.no/ep/schema/1.0/report |
| 4 | 8 | ||
| ... | @@ -15,15 +19,24 @@ | ... | @@ -15,15 +19,24 @@ |
| 15 | 19 | ||
| 16 | ep-prodreport:DailyProductionReport | 20 | ep-prodreport:DailyProductionReport |
| 17 | rdf:type owl:Class ; | 21 | rdf:type owl:Class ; |
| 22 | +<<<<<<< Updated upstream | ||
| 18 | rdfs:label "Daily Production Report"^^xsd:string ; | 23 | rdfs:label "Daily Production Report"^^xsd:string ; |
| 24 | +======= | ||
| 25 | +>>>>>>> Stashed changes | ||
| 19 | rdfs:subClassOf ep-prodreport:ProductionReport . | 26 | rdfs:subClassOf ep-prodreport:ProductionReport . |
| 20 | 27 | ||
| 21 | ep-prodreport:MonthlyProductionReport | 28 | ep-prodreport:MonthlyProductionReport |
| 22 | rdf:type owl:Class ; | 29 | rdf:type owl:Class ; |
| 30 | +<<<<<<< Updated upstream | ||
| 23 | rdfs:label "Monthly Production Report"^^xsd:string ; | 31 | rdfs:label "Monthly Production Report"^^xsd:string ; |
| 32 | +======= | ||
| 33 | +>>>>>>> Stashed changes | ||
| 24 | rdfs:subClassOf ep-prodreport:ProductionReport . | 34 | rdfs:subClassOf ep-prodreport:ProductionReport . |
| 25 | 35 | ||
| 26 | ep-prodreport:ProductionReport | 36 | ep-prodreport:ProductionReport |
| 27 | rdf:type owl:Class ; | 37 | rdf:type owl:Class ; |
| 38 | +<<<<<<< Updated upstream | ||
| 28 | rdfs:label "Production Report"^^xsd:string ; | 39 | rdfs:label "Production Report"^^xsd:string ; |
| 40 | +======= | ||
| 41 | +>>>>>>> Stashed changes | ||
| 29 | rdfs:subClassOf <http://www.reportinghub.no/ep/schema/report#Report> . | 42 | rdfs:subClassOf <http://www.reportinghub.no/ep/schema/report#Report> . | ... | ... |
-
Please register or login to post a comment