update

3 years ago · 1f25f619bd
parent 1dc82484d2
commit 1f25f619bd
1 changed files with 0 additions and 6 deletions
--- a/sandwich.json
+++ b/sandwich.json
@ -20,15 +20,9 @@
    {
      "type": "Point",
      "coordinates": [
-<<<<<<< HEAD
-        1.3790984994140671,
-        51.295153386188261,
-        201.59054565429688
-=======
        1.3779519593942986,
        51.289877289680938,
        122.25299072265625
->>>>>>> 1ec70844dd5b0d2f10ac5f0838fb60e46ce75d20
      ]
    },
    {