Change prop names for loading state to be more Pythonic

Author: valentijnnieman

dash_renderer/dash_renderer.dev.js

@@ -59,11 +59,7 @@
                         "height": "498px"
                     },
                     children=[
-<<<<<<< HEAD
                         dcc.Loading(id='tabs-content', type='graph')
-=======
-                        dcc.Loading(id='tabs-content')
->>>>>>> f860e1c... Add componentName and propName props to loading object, cleanup
                     ]
                 ),
             ],
@@ -72,7 +68,7 @@
         html.Div(
             className="w-80 center",
             children=[
-                dcc.Loading(id='output-1', type='cube')
+                dcc.Loading(id='output-1')
             ],
         ),
         html.Div(
@@ -170,19 +166,7 @@ def render_content(tab):
             )
         ])
 
-<<<<<<< HEAD
 app = dash.Dash(__name__, external_stylesheets=external_stylesheets)
-=======
-
-@app.callback(
-    Output(component_id="output-1", component_property="children"),
-    [Input(component_id="input-1", component_property="value")],
-)
-def update_output_div(input_value):
-    time.sleep(1)
-    return html.H1(className="tc yellow mt4", children=["{}".format(input_value)])
->>>>>>> f860e1c... Add componentName and propName props to loading object, cleanup
-
 
 if __name__ == "__main__":
     app.run_server(debug=True)