From 2ab0c493cbf6dab42c0cd6f05f2fe7533c73fb47 Mon Sep 17 00:00:00 2001 From: David Perl Date: Thu, 10 Jul 2025 13:36:07 +0200 Subject: [PATCH] fix: resolve merge conflict --- .../widgets/ExampleWidgetPlugin/ExampleWidgetPlugin.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/bec_testing_plugin/bec_widgets/widgets/ExampleWidgetPlugin/ExampleWidgetPlugin.py b/bec_testing_plugin/bec_widgets/widgets/ExampleWidgetPlugin/ExampleWidgetPlugin.py index 09737d8..3e120c2 100644 --- a/bec_testing_plugin/bec_widgets/widgets/ExampleWidgetPlugin/ExampleWidgetPlugin.py +++ b/bec_testing_plugin/bec_widgets/widgets/ExampleWidgetPlugin/ExampleWidgetPlugin.py @@ -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()) \ No newline at end of file + sys.exit(app.exec())