fixup

Author: nicolaskruchten

_posts/plotly_js/maps/mapbox-layers/2019-08-16-Open-street-map.html

@@ -34,10 +34,6 @@
 			margin: { r: 0, t: 0, b: 0, l: 0 }
 		};
 
-<<<<<<< HEAD
-		Plotly.newPlot('myDiv', data, layout);
-=======
 		Plotly.newPlot("myDiv", data, layout);
->>>>>>> map examples updated to have inline charts once branch hits master
 	}
 );