fix: resolve merge conflict

This commit is contained in:
2025-07-10 13:36:07 +02:00
committed by David Perl
parent 5cc5c8158e
commit 2ab0c493cb

View File

@@ -1,14 +1,9 @@
from bec_widgets.utils.bec_widget import BECWidget
from qtpy.QtWidgets import QWidget
<<<<<<< before updating
from bec_testing_plugin.bec_widgets.widgets.ExampleWidgetPlugin.ExampleWidgetPlugin_ui import (
Ui_Examplewidgetplugin,
Ui_examplewidgetplugin,
)
=======
from bec_testing_plugin.bec_widgets.widgets.ExampleWidgetPlugin.ExampleWidgetPlugin_ui import Ui_examplewidgetplugin
>>>>>>> after updating
class Examplewidgetplugin(BECWidget, QWidget, Ui_examplewidgetplugin):
@@ -16,6 +11,7 @@ class Examplewidgetplugin(BECWidget, QWidget, Ui_examplewidgetplugin):
super().__init__(parent=parent, **kwargs)
self.setupUi(self)
if __name__ == "__main__":
import sys
@@ -24,4 +20,4 @@ if __name__ == "__main__":
app = QApplication(sys.argv)
widget = Examplewidgetplugin()
widget.show()
sys.exit(app.exec())
sys.exit(app.exec())