remove merge changes

nextmcloud · Aug 13, 2024 · e2197c9 · e2197c9
1 parent 8984847
commit e2197c9
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 3 deletions.
diff --git a/theme.qrc.in b/theme.qrc.in
@@ -240,8 +240,5 @@
         <file>theme/call-notification.wav</file>
         <file>theme/more-apps.svg</file>
         <file>theme/talk-app.svg</file>
-        <file>theme/NMCIcons/configuration1.png</file>
-        <file>theme/NMCIcons/configuration2.png</file>
-        <file>theme/NMCIcons/configuration3.png</file>
     </qresource>
 </RCC>
diff --git a/theme/NMCIcons/configuration1.png b/theme/NMCIcons/configuration1.png
diff --git a/theme/NMCIcons/configuration2.png b/theme/NMCIcons/configuration2.png
diff --git a/theme/NMCIcons/configuration3.png b/theme/NMCIcons/configuration3.png