Merge branch 'highlight' of https://github.com/joshuacano/folium into highlight

joshuacano · joshuacano · commit 5574b10dcc04 · 2016-09-22T11:23:01.000-07:00
diff --git a/examples/folium_examples.ipynb b/examples/folium_examples.ipynb
@@ -169,6 +169,7 @@
    "metadata": {
     "collapsed": false
    },
+<<<<<<< HEAD
    "outputs": [
     {
      "data": {
