fixing conflict

NOC-OI · Dec 11, 2024 · 8138659 · 8138659
2 parents 9765e2d + 1cc8cf0
commit 8138659
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/places.csv b/places.csv
@@ -19,3 +19,4 @@ The Roscoe Head, Pub, Paul, Great Beer and atmosphere, -2.97411, 53.40224
 Honest Burgers, Restaurant, Colin, I've not been here yet, -2.977367, 53.402424
 COFFI, coffee, Jeff, tasty, -2.977367, 53.4024
 Shanghai Places, restaurant, Colin, not been here either, -2.980835, 53.404419
+The White Rabbit, Pub, Esther, Maybe the best pizza in Oxford?, -1.2632956, 51.7544476
diff --git a/places.geojson b/places.geojson
@@ -34,5 +34,9 @@
 { "type": "Feature", "properties": { "marker-size": "medium", "marker-symbol": " Pub", "name": "The Roscoe Head", "creator" : " Paul", "comment" : " Great Beer and atmosphere" },
 "geometry": { "type": "Point", "coordinates": [ -2.97411, 53.40224] } },
 { "type": "Feature", "properties": { "marker-size": "medium", "marker-symbol": " Restaurant", "name": "Honest Burgers", "creator" : " Colin", "comment" : " I've not been here yet" },
-"geometry": { "type": "Point", "coordinates": [ -2.977367, 53.402424] } }
+"geometry": { "type": "Point", "coordinates": [ -2.977367, 53.402424] } },
+{ "type": "Feature", "properties": { "marker-size": "medium", "marker-symbol": " coffee", "name": "COFFI", "creator" : " Jeff", "comment" : " tasty" },
+"geometry": { "type": "Point", "coordinates": [ -2.977367, 53.402424] } },
+{ "type": "Feature", "properties": { "marker-size": "medium", "marker-symbol": " Pub", "name": "The White Rabbit", "creator" : " Esther", "comment" : " Maybe the best pizza in Oxford?" },
+"geometry": { "type": "Point", "coordinates": [ -1.2632956, 51.7544476] } }
 ] }