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,14 +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 114.15 512.1 283.65">
<style type="text/css">
.st0{fill:#1D4AFF;}
.st1{fill:#F9BD2B;}
.st2{fill:#F54E00;}
</style>
<g>
<path class="st0" d="M116.2,272c-3.9,7.9-15.2,7.9-19.1,0l-9.4-18.8c-1.5-3-1.5-6.5,0-9.5l9.4-18.8c3.9-7.9,15.2-7.9,19.1,0 l9.4,18.8c1.5,3,1.5,6.5,0,9.5L116.2,272z M116.2,378.7c-3.9,7.9-15.2,7.9-19.1,0l-9.4-18.8c-1.5-3-1.5-6.5,0-9.5l9.4-18.8 c3.9-7.9,15.2-7.9,19.1,0l9.4,18.8c1.5,3,1.5,6.5,0,9.5L116.2,378.7z"/>
<path class="st1" d="M0,338.2c0-9.5,11.5-14.3,18.2-7.5l48.9,48.9c6.7,6.7,2,18.2-7.5,18.2H10.7C4.8,397.8,0,393,0,387.1V338.2z M0,286.7c0,2.8,1.1,5.5,3.1,7.5l100.4,100.4c2,2,4.7,3.1,7.5,3.1h55.2c9.5,0,14.3-11.5,7.5-18.2L18.2,224 c-6.7-6.7-18.2-2-18.2,7.5V286.7L0,286.7z M0,180c0,2.8,1.1,5.5,3.1,7.5l207.1,207.1c2,2,4.7,3.1,7.5,3.1h55.2 c9.5,0,14.3-11.5,7.5-18.2L18.2,117.3c-6.7-6.7-18.2-2-18.2,7.5V180L0,180z M106.7,180c0,2.8,1.1,5.5,3.1,7.5l192,192 c6.7,6.7,18.2,2,18.2-7.5v-55.2c0-2.8-1.1-5.5-3.1-7.5l-192-192c-6.7-6.7-18.2-2-18.2,7.5V180z M231.5,117.3 c-6.7-6.7-18.2-2-18.2,7.5V180c0,2.8,1.1,5.5,3.1,7.5l85.3,85.3c6.7,6.7,18.2,2,18.2-7.5v-55.2c0-2.8-1.1-5.5-3.1-7.5L231.5,117.3 L231.5,117.3z"/>
<path d="M453.7,339.5L353.3,239.1c-6.7-6.7-18.2-2-18.2,7.5v140.5c0,5.9,4.8,10.7,10.7,10.7h155.6c5.9,0,10.7-4.8,10.7-10.7v-12.8 c0-5.9-4.8-10.6-10.6-11.4C483.4,360.6,466.7,352.5,453.7,339.5z M386.3,363.7c-9.4,0-17.1-7.6-17.1-17.1c0-9.4,7.6-17.1,17.1-17.1 c9.4,0,17.1,7.6,17.1,17.1C403.4,356,395.7,363.7,386.3,363.7z"/>
<path class="st0" d="M0,387.1c0,5.9,4.8,10.7,10.7,10.7h48.9c9.5,0,14.3-11.5,7.5-18.2l-48.9-48.9c-6.7-6.7-18.2-2-18.2,7.5V387.1 L0,387.1z M106.7,205.8l-88.5-88.5c-6.7-6.7-18.2-2-18.2,7.5V180c0,2.8,1.1,5.5,3.1,7.5l103.5,103.5V205.8z M18.2,224 c-6.7-6.7-18.2-2-18.2,7.5v55.2c0,2.8,1.1,5.5,3.1,7.5l103.5,103.5v-85.3L18.2,224L18.2,224z"/>
<path class="st2" d="M213.3,210.2c0-2.8-1.1-5.5-3.1-7.5l-85.3-85.3c-6.7-6.7-18.2-2-18.2,7.5V180c0,2.8,1.1,5.5,3.1,7.5 l103.5,103.5V210.2L213.3,210.2z M106.7,397.8h59.6c9.5,0,14.3-11.5,7.5-18.2l-67.1-67.1V397.8z M106.7,205.8v80.9 c0,2.8,1.1,5.5,3.1,7.5l103.5,103.5v-80.9c0-2.8-1.1-5.5-3.1-7.5L106.7,205.8z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 114.15 512.1 283.65"><style>.st0{fill:#1d4aff}</style><path d="M116.2 272c-3.9 7.9-15.2 7.9-19.1 0l-9.4-18.8c-1.5-3-1.5-6.5 0-9.5l9.4-18.8c3.9-7.9 15.2-7.9 19.1 0l9.4 18.8c1.5 3 1.5 6.5 0 9.5zm0 106.7c-3.9 7.9-15.2 7.9-19.1 0l-9.4-18.8c-1.5-3-1.5-6.5 0-9.5l9.4-18.8c3.9-7.9 15.2-7.9 19.1 0l9.4 18.8c1.5 3 1.5 6.5 0 9.5z" class="st0"/><path d="M0 338.2c0-9.5 11.5-14.3 18.2-7.5l48.9 48.9c6.7 6.7 2 18.2-7.5 18.2H10.7C4.8 397.8 0 393 0 387.1zm0-51.5c0 2.8 1.1 5.5 3.1 7.5l100.4 100.4c2 2 4.7 3.1 7.5 3.1h55.2c9.5 0 14.3-11.5 7.5-18.2L18.2 224c-6.7-6.7-18.2-2-18.2 7.5zM0 180c0 2.8 1.1 5.5 3.1 7.5l207.1 207.1c2 2 4.7 3.1 7.5 3.1h55.2c9.5 0 14.3-11.5 7.5-18.2L18.2 117.3c-6.7-6.7-18.2-2-18.2 7.5zm106.7 0c0 2.8 1.1 5.5 3.1 7.5l192 192c6.7 6.7 18.2 2 18.2-7.5v-55.2c0-2.8-1.1-5.5-3.1-7.5l-192-192c-6.7-6.7-18.2-2-18.2 7.5zm124.8-62.7c-6.7-6.7-18.2-2-18.2 7.5V180c0 2.8 1.1 5.5 3.1 7.5l85.3 85.3c6.7 6.7 18.2 2 18.2-7.5v-55.2c0-2.8-1.1-5.5-3.1-7.5z" style="fill:#f9bd2b"/><path d="M453.7 339.5 353.3 239.1c-6.7-6.7-18.2-2-18.2 7.5v140.5c0 5.9 4.8 10.7 10.7 10.7h155.6c5.9 0 10.7-4.8 10.7-10.7v-12.8c0-5.9-4.8-10.6-10.6-11.4-18.1-2.3-34.8-10.4-47.8-23.4m-67.4 24.2c-9.4 0-17.1-7.6-17.1-17.1 0-9.4 7.6-17.1 17.1-17.1 9.4 0 17.1 7.6 17.1 17.1 0 9.4-7.7 17.1-17.1 17.1"/><path d="M0 387.1c0 5.9 4.8 10.7 10.7 10.7h48.9c9.5 0 14.3-11.5 7.5-18.2l-48.9-48.9c-6.7-6.7-18.2-2-18.2 7.5zm106.7-181.3-88.5-88.5c-6.7-6.7-18.2-2-18.2 7.5V180c0 2.8 1.1 5.5 3.1 7.5L106.6 291v-85.2zM18.2 224c-6.7-6.7-18.2-2-18.2 7.5v55.2c0 2.8 1.1 5.5 3.1 7.5l103.5 103.5v-85.3z" class="st0"/><path d="M213.3 210.2c0-2.8-1.1-5.5-3.1-7.5l-85.3-85.3c-6.7-6.7-18.2-2-18.2 7.5V180c0 2.8 1.1 5.5 3.1 7.5L213.3 291zM106.7 397.8h59.6c9.5 0 14.3-11.5 7.5-18.2l-67.1-67.1zm0-192v80.9c0 2.8 1.1 5.5 3.1 7.5l103.5 103.5v-80.9c0-2.8-1.1-5.5-3.1-7.5z" style="fill:#f54e00"/></svg>

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB