fix: resolve merge conflicts

This commit is contained in:
Dashboard Icons Bot
2025-01-05 02:54:50 +00:00
committed by Bjorn Lammers
parent b560a099e9
commit 1dde587869
4944 changed files with 1635 additions and 73999 deletions

View File

@@ -1,10 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" style="enable-background:new 0 0 512 512;" xml:space="preserve" viewBox="0 103.6 512 304.7">
<style type="text/css">
.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#7F54B3;}
.st1{fill:#FFFFFF;}
</style>
<g>
<path class="st0" d="M47.5,103.6h416.8c26.4,0,47.7,21.4,47.7,47.7v159.1c0,26.4-21.4,47.7-47.7,47.7H314.8l20.5,50.2l-90.2-50.2 H47.7C21.4,358.1,0,336.8,0,310.4V151.3C-0.2,125.2,21.1,103.6,47.5,103.6L47.5,103.6z"/>
<path class="st1" d="M25.5,146.9c2.9-4,7.3-6.1,13.2-6.5c10.7-0.8,16.7,4.2,18.2,15.1c6.5,43.7,13.6,80.8,21.1,111.1l45.8-87.3 c4.2-8,9.4-12.1,15.7-12.6c9.2-0.6,14.9,5.2,17.2,17.6c5.2,27.8,11.9,51.5,19.9,71.6c5.4-53.2,14.7-91.5,27.6-115.1 c3.1-5.9,7.7-8.8,13.8-9.2c4.8-0.4,9.2,1,13.2,4.2c4,3.1,6.1,7.1,6.5,11.9c0.2,3.8-0.4,6.9-2.1,10c-8.2,15.1-14.9,40.4-20.3,75.6 c-5.2,34.1-7.1,60.7-5.9,79.8c0.4,5.2-0.4,9.8-2.5,13.8c-2.5,4.6-6.3,7.1-11.1,7.5c-5.4,0.4-11.1-2.1-16.5-7.7 c-19.5-19.9-35-49.6-46.3-89.2c-13.6,26.8-23.7,46.9-30.1,60.3c-12.3,23.7-22.8,35.8-31.6,36.4c-5.7,0.4-10.5-4.4-14.7-14.4 C46.1,292.4,34.5,239.5,22.2,161C21.6,155.5,22.6,150.7,25.5,146.9L25.5,146.9z M475.6,179.8c-7.5-13.2-18.6-21.1-33.5-24.3 c-4-0.8-7.7-1.3-11.3-1.3c-20.1,0-36.4,10.5-49.2,31.4c-10.9,17.8-16.3,37.5-16.3,59c0,16.1,3.3,29.9,10,41.4 c7.5,13.2,18.6,21.1,33.5,24.3c4,0.8,7.7,1.3,11.3,1.3c20.3,0,36.6-10.5,49.2-31.4c10.9-18,16.3-37.7,16.3-59.2 C485.6,204.7,482.3,191.1,475.6,179.8z M449.2,237.8c-2.9,13.8-8.2,24.1-15.9,31c-6.1,5.4-11.7,7.7-17,6.7c-5-1-9.2-5.4-12.3-13.6 c-2.5-6.5-3.8-13-3.8-19c0-5.2,0.4-10.5,1.5-15.3c1.9-8.6,5.4-17,11.1-24.9c6.9-10.3,14.2-14.4,21.8-13c5,1,9.2,5.4,12.3,13.6 c2.5,6.5,3.8,13,3.8,19C450.7,227.7,450,233,449.2,237.8L449.2,237.8z M344.3,179.8c-7.5-13.2-18.8-21.1-33.5-24.3 c-4-0.8-7.7-1.3-11.3-1.3c-20.1,0-36.4,10.5-49.2,31.4c-10.9,17.8-16.3,37.5-16.3,59c0,16.1,3.3,29.9,10,41.4 c7.5,13.2,18.6,21.1,33.5,24.3c4,0.8,7.7,1.3,11.3,1.3c20.3,0,36.6-10.5,49.2-31.4c10.9-18,16.3-37.7,16.3-59.2 C354.4,204.7,351,191.1,344.3,179.8z M318,237.8c-2.9,13.8-8.2,24.1-15.9,31c-6.1,5.4-11.7,7.7-17,6.7c-5-1-9.2-5.4-12.3-13.6 c-2.5-6.5-3.8-13-3.8-19c0-5.2,0.4-10.5,1.5-15.3c1.9-8.6,5.4-17,11.1-24.9c6.9-10.3,14.2-14.4,21.8-13c5,1,9.2,5.4,12.3,13.6 c2.5,6.5,3.8,13,3.8,19C319.4,227.7,319,233,318,237.8L318,237.8z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 103.6 512 304.7"><path d="M47.5 103.6h416.8c26.4 0 47.7 21.4 47.7 47.7v159.1c0 26.4-21.4 47.7-47.7 47.7H314.8l20.5 50.2-90.2-50.2H47.7C21.4 358.1 0 336.8 0 310.4V151.3c-.2-26.1 21.1-47.7 47.5-47.7" style="fill-rule:evenodd;clip-rule:evenodd;fill:#7f54b3"/><path d="M25.5 146.9c2.9-4 7.3-6.1 13.2-6.5 10.7-.8 16.7 4.2 18.2 15.1 6.5 43.7 13.6 80.8 21.1 111.1l45.8-87.3c4.2-8 9.4-12.1 15.7-12.6 9.2-.6 14.9 5.2 17.2 17.6 5.2 27.8 11.9 51.5 19.9 71.6 5.4-53.2 14.7-91.5 27.6-115.1 3.1-5.9 7.7-8.8 13.8-9.2q7.2-.6 13.2 4.2c4 3.1 6.1 7.1 6.5 11.9.2 3.8-.4 6.9-2.1 10-8.2 15.1-14.9 40.4-20.3 75.6-5.2 34.1-7.1 60.7-5.9 79.8.4 5.2-.4 9.8-2.5 13.8-2.5 4.6-6.3 7.1-11.1 7.5-5.4.4-11.1-2.1-16.5-7.7-19.5-19.9-35-49.6-46.3-89.2-13.6 26.8-23.7 46.9-30.1 60.3-12.3 23.7-22.8 35.8-31.6 36.4-5.7.4-10.5-4.4-14.7-14.4-10.5-27.4-22.1-80.3-34.4-158.8-.6-5.5.4-10.3 3.3-14.1m450.1 32.9c-7.5-13.2-18.6-21.1-33.5-24.3-4-.8-7.7-1.3-11.3-1.3-20.1 0-36.4 10.5-49.2 31.4-10.9 17.8-16.3 37.5-16.3 59 0 16.1 3.3 29.9 10 41.4 7.5 13.2 18.6 21.1 33.5 24.3 4 .8 7.7 1.3 11.3 1.3 20.3 0 36.6-10.5 49.2-31.4 10.9-18 16.3-37.7 16.3-59.2 0-16.3-3.3-29.9-10-41.2m-26.4 58c-2.9 13.8-8.2 24.1-15.9 31-6.1 5.4-11.7 7.7-17 6.7-5-1-9.2-5.4-12.3-13.6-2.5-6.5-3.8-13-3.8-19 0-5.2.4-10.5 1.5-15.3 1.9-8.6 5.4-17 11.1-24.9 6.9-10.3 14.2-14.4 21.8-13 5 1 9.2 5.4 12.3 13.6 2.5 6.5 3.8 13 3.8 19 0 5.4-.7 10.7-1.5 15.5m-104.9-58c-7.5-13.2-18.8-21.1-33.5-24.3-4-.8-7.7-1.3-11.3-1.3-20.1 0-36.4 10.5-49.2 31.4-10.9 17.8-16.3 37.5-16.3 59 0 16.1 3.3 29.9 10 41.4 7.5 13.2 18.6 21.1 33.5 24.3 4 .8 7.7 1.3 11.3 1.3 20.3 0 36.6-10.5 49.2-31.4 10.9-18 16.3-37.7 16.3-59.2.1-16.3-3.3-29.9-10-41.2m-26.3 58c-2.9 13.8-8.2 24.1-15.9 31-6.1 5.4-11.7 7.7-17 6.7-5-1-9.2-5.4-12.3-13.6-2.5-6.5-3.8-13-3.8-19 0-5.2.4-10.5 1.5-15.3 1.9-8.6 5.4-17 11.1-24.9 6.9-10.3 14.2-14.4 21.8-13 5 1 9.2 5.4 12.3 13.6 2.5 6.5 3.8 13 3.8 19-.1 5.4-.5 10.7-1.5 15.5" style="fill:#fff"/></svg>

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB