From e7989dff8174f050bc78e232890db9982dfd8b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 9 Jan 2019 19:09:13 +0100 Subject: [PATCH] =?UTF-8?q?[merge]=20fix=20conflict=C3=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/locale/LocalePage.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp index 9616ff22d..56e4b0f37 100644 --- a/src/modules/locale/LocalePage.cpp +++ b/src/modules/locale/LocalePage.cpp @@ -387,12 +387,7 @@ std::pair< QString, QString > LocalePage::prettyLocaleStatus( const LocaleConfig { using CalamaresUtils::LocaleLabel; -<<<<<<< HEAD - LocaleLabel lang( lc.lang, LocaleLabel::LabelFormat::AlwaysWithCountry ); -======= LocaleLabel lang( lc.language(), LocaleLabel::LabelFormat::AlwaysWithCountry ); ->>>>>>> 44211ee19a30eb062508bba565da274c53b16a71 - LocaleLabel num( lc.lc_numeric, LocaleLabel::LabelFormat::AlwaysWithCountry ); return std::make_pair< QString, QString >( tr( "The system language will be set to %1." ).arg( lang.label() ),