fix: conflict

Author: AlexandrKudrya

qrgui/brandManager/styles.cpp

@@ -21,19 +21,11 @@
 
 using namespace qReal;
 
-<<<<<<< HEAD
 QPalette Styles::loadPalette(const QString& pathToPalette) const {
 	QSettings settings(pathToPalette, QSettings::IniFormat);
 	QPalette palette;
 
 	static QMap<QString, QPalette::ColorRole> colorRoles = {
-=======
-QPalette Styles::loadPalette(QString pathToPalette) const {
-	QSettings settings(pathToPalette, QSettings::IniFormat);
-	QPalette palette;
-
-	const QMap<QString, QPalette::ColorRole> colorRoles = {
->>>>>>> e4c45bd1f (fix: style.cpp depenties fixes)
 		{"Window", QPalette::Window},
 		{"WindowText", QPalette::WindowText},
 		{"Base", QPalette::Base},