* Remove duplicate imageoverlay example

* Corrected merge of script_auckland.js
kartena · Jan 25, 2017 · 23c55de · 23c55de
1 parent 492fdb0
commit 23c55de
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 49 deletions.
diff --git a/examples/imageoverlay/index.html b/examples/imageoverlay/index.html
diff --git a/examples/imageoverlay/script.js b/examples/imageoverlay/script.js
diff --git a/examples/imageoverlay/style.css b/examples/imageoverlay/style.css
diff --git a/examples/local-projections/nz/script_auckland.js b/examples/local-projections/nz/script_auckland.js
@@ -23,13 +23,8 @@ var	map = new L.Map('map', {
 	crs: crs,
 });
 
-<<<<<<< HEAD
-var tileUrl = 'http://maps.aucklandcouncil.govt.nz/ArcGIS/rest/services/Aerials/MapServer/tile/{z}/{y}/{x}',
-	attrib = 'Auckland City Council &copy;',
-=======
 var tileUrl = 'https://maps.aucklandcouncil.govt.nz/ArcGIS/rest/services/Aerials/MapServer/tile/{z}/{y}/{x}',
 	attrib = 'Auckland City Council &copy; 2012',
->>>>>>> 5aef9d20cb45e1387278b5c7fc3977278c6d39e7
 	tilelayer = new L.TileLayer(tileUrl, {
 		maxZoom: 12,
 		minZoom: 0,