data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
MonkeyChap
55efed93 1 parent 51cae32f

Removed all the ==== and >>>> chars that Github inserted…yawn

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