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,24 +1 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.7.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
<style type="text/css">
.st0{fill:#555555;}
.st1{fill:#6CD591;}
.st2{fill:#FFFFFF;}
</style>
<g>
<path class="st0" d="M413.9,512H98.1C43.9,512,0,468.1,0,413.9V98.1C0,43.9,43.9,0,98.1,0h315.9C468.1,0,512,43.9,512,98.1v315.9
C512,468.1,468.1,512,413.9,512z"/>
<g>
<path class="st1" d="M38.2,160.7c0-14.3,12.9-24.1,28.1-21.9L265,164.8c8.9,1.3,16,10.9,16,21.4v27.1
c-16.7,11.2-27.7,30-27.7,51.2c0,21.5,10.7,40.1,27.7,51.2v11.9c0,10.5-7.1,20.1-16,21.4L88.7,373.2c-15.2,2.2-28.1-7.6-28.1-21.9
L38.2,160.7z M123.9,185.6H97.7v34.3H81.1v19.8h16.6v38.1c-0.8,24,8.6,34.7,30.3,34.9h20.2v-19.8h-10.4
c-11.7-0.6-14.3-4-13.9-19.4v-33.7h32.2l29.8,73h28.2l41.1-92.8h-27.8l-26.6,63.9l-24.2-63.9h-52.6L123.9,185.6z"/>
<path class="st2" d="M423.9,218c17,0,28.3,4.2,36.9,13.7c7,7.6,10.7,18.9,10.7,31.5c0,18.3-7.4,32.6-20.9,40.8
c-8.8,5.3-16.4,6.9-33.6,6.9h-42.6V183.7h26.2V218H423.9z M400.6,291.1H420c15.4,0,24.8-10.3,24.8-27.1c0-17.5-8.2-26.1-24.8-26.1
h-19.4V291.1z M334.2,183.7h26.2v127.1h-45.2c-18.4,0-27.2-2.7-36.6-10.9c-9.6-8.6-14.5-20.8-14.5-36.2c0-16,5.3-28.2,16.4-37.2
c7-5.7,16.6-8.6,28.9-8.6h24.6L334.2,183.7z M334.2,237.9h-19c-15.2,0-24.4,9.7-24.4,25.9c0,17,9.4,27.3,24.4,27.3h19V237.9z"/>
</g>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><path d="M413.9 512H98.1C43.9 512 0 468.1 0 413.9V98.1C0 43.9 43.9 0 98.1 0H414c54.1 0 98 43.9 98 98.1V414c0 54.1-43.9 98-98.1 98" style="fill:#555"/><path d="M38.2 160.7c0-14.3 12.9-24.1 28.1-21.9l198.7 26c8.9 1.3 16 10.9 16 21.4v27.1c-16.7 11.2-27.7 30-27.7 51.2 0 21.5 10.7 40.1 27.7 51.2v11.9c0 10.5-7.1 20.1-16 21.4L88.7 373.2c-15.2 2.2-28.1-7.6-28.1-21.9zm85.7 24.9H97.7v34.3H81.1v19.8h16.6v38.1c-.8 24 8.6 34.7 30.3 34.9h20.2v-19.8h-10.4c-11.7-.6-14.3-4-13.9-19.4v-33.7h32.2l29.8 73h28.2l41.1-92.8h-27.8l-26.6 63.9-24.2-63.9H124z" style="fill:#6cd591"/><path d="M423.9 218c17 0 28.3 4.2 36.9 13.7 7 7.6 10.7 18.9 10.7 31.5 0 18.3-7.4 32.6-20.9 40.8-8.8 5.3-16.4 6.9-33.6 6.9h-42.6V183.7h26.2V218zm-23.3 73.1H420c15.4 0 24.8-10.3 24.8-27.1 0-17.5-8.2-26.1-24.8-26.1h-19.4zm-66.4-107.4h26.2v127.1h-45.2c-18.4 0-27.2-2.7-36.6-10.9-9.6-8.6-14.5-20.8-14.5-36.2 0-16 5.3-28.2 16.4-37.2 7-5.7 16.6-8.6 28.9-8.6H334zm0 54.2h-19c-15.2 0-24.4 9.7-24.4 25.9 0 17 9.4 27.3 24.4 27.3h19z" style="fill:#fff"/></svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB