Fix rebase error in TopoJson

Author: Martin Journois

folium/features.py

@@ -197,6 +197,7 @@ def render(self, **kwargs):
             vg.parse.spec(spec, function(chart) { chart({el:div}).update(); });}"""),  # noqa
             name='vega_parse')
 
+
 class GeoJson(Layer):
     def __init__(self, data, style_function=None, name=None, overlay=True, control=True):
         """
@@ -321,8 +322,10 @@ def _get_self_bounds(self):
                     ]
         return bounds
 
+
 class TopoJson(Layer):
-    def __init__(self, data, object_path, name=None, overlay=True, control=True):
+    def __init__(self, data, object_path, style_function=None,
+                 name=None, overlay=True, control=True):
         """
         TODO docstring here