From e7f78fe97615d2f47e51ae2a244b8b5bc06e591e Mon Sep 17 00:00:00 2001
From: Siegfried Siegert <s.siegert@atb-online.eu>
Date: Thu, 5 Feb 2026 15:10:18 +0100
Subject: [PATCH] Fix: merge-conflict from 'save for christmas' ...

518bd870336d61b9b32424d668750c3923cc9387 2024-12-20 13:01:34
---
 UpdatePTUDevCtrl/mainwindow.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/UpdatePTUDevCtrl/mainwindow.cpp b/UpdatePTUDevCtrl/mainwindow.cpp
index 7fe8487..c17b24d 100644
--- 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();