change back to original ExampleQuery.rq

huanyu-li · huanyu-li · commit 204a59549ac0 · 2024-06-27T11:00:02.000+02:00
diff --git a/ExampleQuery.rq b/ExampleQuery.rq
@@ -12,7 +12,6 @@ SELECT * WHERE {
 		?cc rdfs:label ?o
 	}
 }
-<<<<<<< HEAD
 
 # An example query that must take into account vocabulary mappings
 #SELECT * WHERE {
@@ -34,6 +33,4 @@ SELECT * WHERE {
 #| <http://www.wikidata.org/entity/Q5593> | <https://schema.org/artist> | <http://dbpedia.org/resource/Carles_Canut>     |
 #| <http://www.wikidata.org/entity/Q5593> | <https://schema.org/artist> | <http://dbpedia.org/resource/Carles_Casagemas> |
 #| <http://www.wikidata.org/entity/Q5593> | <https://schema.org/artist> | <http://dbpedia.org/resource/Carlos_Albert>    |
-#-------------------------------------------------------------------------------------------------------------------------
-=======
->>>>>>> parent of 52db49f1 (change example query)
+#-------------------------------------------------------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ SELECT * WHERE {`
`12`	`12`	`?cc rdfs:label ?o`
`13`	`13`	`}`
`14`	`14`	`}`
`15`		`-<<<<<<< HEAD`
`16`	`15`
`17`	`16`	`# An example query that must take into account vocabulary mappings`
`18`	`17`	`#SELECT * WHERE {`
`@@ -34,6 +33,4 @@ SELECT * WHERE {`
`34`	`33`	`#\| <http://www.wikidata.org/entity/Q5593> \| <https://schema.org/artist> \| <http://dbpedia.org/resource/Carles_Canut> \|`
`35`	`34`	`#\| <http://www.wikidata.org/entity/Q5593> \| <https://schema.org/artist> \| <http://dbpedia.org/resource/Carles_Casagemas> \|`
`36`	`35`	`#\| <http://www.wikidata.org/entity/Q5593> \| <https://schema.org/artist> \| <http://dbpedia.org/resource/Carlos_Albert> \|`
`37`		`-#-------------------------------------------------------------------------------------------------------------------------`
`38`		`-=======`
`39`		`->>>>>>> parent of 52db49f1 (change example query)`
	`36`	`+#-------------------------------------------------------------------------------------------------------------------------`