sort paths in Resources to eliminate merge conflicts

2019-09-02 18:53:08 +02:00
parent 661a36c2e4
commit 234cdb041b
4 changed files with 73 additions and 70 deletions
@@ -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;