From 46b427740bcb02f730c99db9dfc77f7b0fc3a216 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Fri, 21 Jan 2022 17:10:48 +0100
Subject: [PATCH] Fixed a merge issue

---
 src/edt/edt/edtPCellParametersPage.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edt/edt/edtPCellParametersPage.cc b/src/edt/edt/edtPCellParametersPage.cc
index b091e31e0..27c3fd0b9 100644
--- a/src/edt/edt/edtPCellParametersPage.cc
+++ b/src/edt/edt/edtPCellParametersPage.cc
@@ -214,7 +214,7 @@ PCellParametersPage::init ()
 
   mp_error_label = new QLabel (mp_update_frame);
   mp_error_label->setWordWrap (true);
-  QPalette palette = mp_error_label->palette ();
+  palette = mp_error_label->palette ();
   palette.setColor (QPalette::WindowText, Qt::red);
   mp_error_label->setPalette (palette);
   font = mp_error_label->font ();