合并冲突

2021-03-27 12:16:30 +08:00
parent 347fc6dbad
commit efda8a537d
30 changed files with 34 additions and 34 deletions
--- a/icons/1024x1024.png
+++ b/icons/1024x1024.png
--- a/icons/120x120.png
+++ b/icons/120x120.png
--- a/icons/144x144.png
+++ b/icons/144x144.png
--- a/icons/152x152.png
+++ b/icons/152x152.png
--- a/icons/167x167.png
+++ b/icons/167x167.png
--- a/icons/180x180.png
+++ b/icons/180x180.png
--- a/icons/192x192.png
+++ b/icons/192x192.png
--- a/icons/20x20.png
+++ b/icons/20x20.png
--- a/icons/29x29.png
+++ b/icons/29x29.png
--- a/icons/40x40.png
+++ b/icons/40x40.png
--- a/icons/58x58.png
+++ b/icons/58x58.png
--- a/icons/60x60.png
+++ b/icons/60x60.png
--- a/icons/72x72.png
+++ b/icons/72x72.png
--- a/icons/76x76.png
+++ b/icons/76x76.png
--- a/icons/80x80.png
+++ b/icons/80x80.png
--- a/icons/87x87.png
+++ b/icons/87x87.png
--- a/icons/96x96.png
+++ b/icons/96x96.png