Fix merge issue.

Qiskit · Feb 1, 2023 · 11f546a · 11f546a
1 parent c2abbac
commit 11f546a
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/qiskit_ibm_provider/visualization/interactive/plotly_wrapper.py b/qiskit_ibm_provider/visualization/interactive/plotly_wrapper.py
@@ -18,11 +18,6 @@
 import plotly.graph_objects as go
 
 # pylint: disable=abstract-method
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 2ce90ac (Fix ALAP scheduler and add test.)
 class PlotlyFigure:
     """A simple wrapper around ``plotly.graph_objects.Figure`` class.