Fix: merge-conflict from 'save for christmas' ...

518bd87033 2024-12-20 13:01:34
2026-02-05 15:10:18 +01:00
parent 2ac87e93e4
commit e7f78fe976
1 changed files with 1 additions and 6 deletions
--- a/UpdatePTUDevCtrl/mainwindow.cpp
+++ b/UpdatePTUDevCtrl/mainwindow.cpp
@@ -27,6 +27,7 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
    , m_updateStep(UpdateDcEvent::UpdateStep::NONE) {

    ui->setupUi(this);
+    checkOrientation();

    this->setStatusBar(new QStatusBar(this));
    QFont f;
@@ -36,12 +37,6 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
    f.setPointSize(11);
    this->statusBar()->setFont(f);

-<<<<<<< HEAD
-    ui->setupUi(this);
-    checkOrientation();
-
-=======
->>>>>>> 7bfb7f5... save for christmas
    ui->updateProgress->setRange(0, 100);
    ui->updateProgress->reset();