remove merge changes

nextmcloud · Aug 13, 2024 · 51a63d0 · 51a63d0
1 parent 643406a
commit 51a63d0
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 101 deletions.
diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h
@@ -113,7 +113,6 @@ public slots:
 
 protected:
     void changeEvent(QEvent *) override;
-    void paintEvent(QPaintEvent *event) override;
 
 private:
     void customizeStyle();

diff --git a/theme/NMCIcons/ApplicationLogo.svg b/theme/NMCIcons/ApplicationLogo.svg
diff --git a/theme/NMCIcons/folderLogo.svg b/theme/NMCIcons/folderLogo.svg
diff --git a/theme/NMCIcons/tlogocarrier.svg b/theme/NMCIcons/tlogocarrier.svg