Add continuous_update toggle for option widgets.

korsbo · Mar 6, 2018 · 4fe80f1 · 4fe80f1
1 parent dacbe86
commit 4fe80f1
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/IJulia/statedict.jl b/src/IJulia/statedict.jl
@@ -49,7 +49,10 @@ statedict{view, T}(d::Options{view, T}) =
          :tooltips=>d.tooltips,
          :readout => d.readout,
          :continuous_update=>d.continuous_update,
+<<<<<<< HEAD
          :orientation => d.orientation,
+=======
+>>>>>>> Add continuous_update toggle for option widgets.
          :_options_labels=>collect(keys(d.options)))
 
 statedict(w::Widget) = begin