Resolve conflict

OpenMDAO · Aug 7, 2023 · 173edcc · 173edcc
2 parents 072bfde + c7382c9
commit 173edcc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dymos/visualization/timeseries/bokeh_timeseries_report.py b/dymos/visualization/timeseries/bokeh_timeseries_report.py
@@ -5,8 +5,8 @@
 try:
     from bokeh.io import output_notebook, output_file, save, show
     from bokeh.layouts import column, grid, row
-    from bokeh.models import Legend, DataTable, Div, ColumnDataSource, TableColumn, TabPanel, Tabs, \
-        CheckboxButtonGroup, CustomJS, MultiChoice
+    from bokeh.models import Legend, DataTable, Div, ColumnDataSource, TableColumn, \
+        TabPanel, Tabs, CheckboxButtonGroup, CustomJS, MultiChoice
     from bokeh.plotting import figure, curdoc
     import bokeh.palettes as bp
     import bokeh.resources as bokeh_resources