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,13 +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 375 375;" xml:space="preserve" viewBox="51.3 2.7 272.3 369.5">
<style type="text/css">
.st0{fill:none;stroke:#ededed;stroke-width:32;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:8;stroke-opacity:0.9;}
</style>
<g>
<path class="st0" d="M165.8,173.1c-19.1-11.3-29.2-67.1,9.7-52c6.1,2.4,8.6,10.8,13.8,10.8c1.3,0,33.5-32,40.7,3.1 c0.6,2.8,0.8,7.2,0,10.1c-6.5,22-26.9,19.5-39.4,31.5c-7.5,7.2,0,43.9,0,71.1" fill="#ededed"/>
<path class="st0" d="M67.3,218.3c71,51.8,165.4,53.4,240.3,9.6" fill="#ededed"/>
<path class="st0" d="M131.4,256.8c6.6,76.2-9.8,99.8,32.5,99.4c3.8,0,14,0,17.2,0c0.2,0.1,4.8-97.1,10.4-97.1 c5.8,0,4.9,97.3,7.2,97.1c52.8-2.7,51.2,7.5,52.4-26c0.4-12.3-2.3-56.3,0-73.5" fill="#ededed"/>
<path class="st0" d="M125.9,52.8c0.2-9.9,0.8-19.6,0.8-29.5" fill="#ededed"/>
<path class="st0" d="M249.4,55c-0.8-12.3,1.2-24.2,1.2-36.3" fill="#ededed"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Layer_1" x="0" y="0" version="1.1" viewBox="51.3 2.7 272.3 369.5"><style>.st0{fill:none;stroke:#ededed;stroke-width:32;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:8;stroke-opacity:.9}</style><path fill="#ededed" d="M165.8 173.1c-19.1-11.3-29.2-67.1 9.7-52 6.1 2.4 8.6 10.8 13.8 10.8 1.3 0 33.5-32 40.7 3.1.6 2.8.8 7.2 0 10.1-6.5 22-26.9 19.5-39.4 31.5-7.5 7.2 0 43.9 0 71.1" class="st0"/><path fill="#ededed" d="M67.3 218.3c71 51.8 165.4 53.4 240.3 9.6" class="st0"/><path fill="#ededed" d="M131.4 256.8c6.6 76.2-9.8 99.8 32.5 99.4h17.2c.2.1 4.8-97.1 10.4-97.1 5.8 0 4.9 97.3 7.2 97.1 52.8-2.7 51.2 7.5 52.4-26 .4-12.3-2.3-56.3 0-73.5M125.9 52.8c.2-9.9.8-19.6.8-29.5M249.4 55c-.8-12.3 1.2-24.2 1.2-36.3" class="st0"/></svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 805 B