fix merge conflicts

This commit is contained in:
Ward 2021-07-27 15:57:25 +02:00
commit 597dc9900a
6 changed files with 93 additions and 113 deletions

View file

@ -40,7 +40,7 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
"minzoom": "13",
"minzoom": 13,
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
}
@ -56,9 +56,11 @@
"operator~.*[nN]atuurpunt.*"
]
},
"geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_nature_reserve_points.geojson"
"geoJson": "https://pietervdvn.github.io/natuurpunt_cache/natuurpunt_nature_reserve_points.geojson",
"isOsmCache": "duplicate"
},
"minzoom": "0",
"minzoom": 1,
"maxzoom": 13,
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/nature_reserve.svg"
}