Merge branch 'master' of sync.virgis.co.uk:/virgis/projects

3 years ago · 052ec496d5
parent 4494043104 1ec70844dd
commit 052ec496d5
1 changed files with 7 additions and 1 deletions
--- a/sandwich.json
+++ b/sandwich.json
@ -9,7 +9,7 @@
    ]
  },
  "scales": [
-    1.0,
+    2.1214416,
    1.0,
    1.0,
    1.0
@ -20,9 +20,15 @@
    {
      "type": "Point",
      "coordinates": [
+<<<<<<< HEAD
        1.3790984994140671,
        51.295153386188261,
        201.59054565429688
+=======
+        1.3779519593942986,
+        51.289877289680938,
+        122.25299072265625
+>>>>>>> 1ec70844dd5b0d2f10ac5f0838fb60e46ce75d20
      ]
    },
    {