chatterino2
Code Issues

sort paths in Resources to eliminate merge conflicts

Browse Source
This commit is contained in:
fourtf
2019-09-02 18:53:08 +02:00
parent 661a36c2e4
commit 234cdb041b
4 changed files with 73 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/autogenerated/ResourcesAutogen.cpp
+1
View File
@@ -11,6 +11,7 @@ Resources2::Resources2()
this->buttons.ban = QPixmap(":/buttons/ban.png");
this->buttons.banRed = QPixmap(":/buttons/banRed.png");
this->buttons.copyDark = QPixmap(":/buttons/copyDark.png");
this->buttons.copyDarkTheme = QPixmap(":/buttons/copyDarkTheme.png");
this->buttons.copyLight = QPixmap(":/buttons/copyLight.png");
this->buttons.menuDark = QPixmap(":/buttons/menuDark.png");
this->buttons.menuLight = QPixmap(":/buttons/menuLight.png");
src/autogenerated/ResourcesAutogen.hpp
+2 -2
View File
@@ -3,8 +3,7 @@
namespace chatterino {
class Resources2 : public Singleton
{
class Resources2 : public Singleton {
public:
Resources2();
@@ -18,6 +17,7 @@ public:
QPixmap ban;
QPixmap banRed;
QPixmap copyDark;
QPixmap copyDarkTheme;
QPixmap copyLight;
QPixmap menuDark;
QPixmap menuLight;