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,12 +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="32.01 -0.02 447.86 511.98">
<style type="text/css">
.st0{fill:#9DE8FF;}
.st1{fill:#106BF3;}
.st2{fill:#57AAF9;}
</style>
<g>
<path class="st0" d="M249,7.3c9.3,7,14.5,16.6,15.6,28.7l0.2-0.1v2.8c0,0.6,0,1.3,0,1.9l0,0v246.2c0.2,12.8,5,23,14.4,30.5 c14.1,10,28.7,11,44,2.8l-199.6,115c-14.8,7.6-29,7-42.5-2c-9.3-7-14.5-16.6-15.6-28.7l-0.2,0.1l0-252.2 c-0.5-12.3-5.3-22.1-14.4-29.4c-4.5-3.2-9-5.5-13.7-6.8c-6.6-1.7-6.6-9.9-1.7-12.4c11-6.3,68-39.2,171-98.5 C221.3-2.4,235.5-1.7,249,7.3z"/>
<path class="st1" d="M264.7,286.8c-0.1-24.8-20.4-60.8-61.4-60.8c-11.4,0-22,3-31.9,8.9l183-105.4c9.1-5.3,19.6-8.3,30.9-8.3 c33.8,0,61.2,27.2,61.4,60.7c0,0,0,0.1,0,0.4l0,186c0.2,12.8,5,23,14.4,30.5c4.5,3.2,9.1,5.5,13.8,6.9c6.7,2.2,6,10.1,1.6,12.4 c-25.4,14.6-76.6,44.2-153.5,88.6c-14.8,7.6-29,7-42.5-2c-9.3-7-14.5-16.6-15.6-28.8l-0.2,0.1v-46 C264.7,382.3,264.7,286.9,264.7,286.8z"/>
<path class="st2" d="M203.4,226c33.9,0,61.4,27.4,61.4,61.1c0,33.9,0,56.1,0,66.7c0,0-105.6,60.8-120.9,69.6c-1.2,0.7-21,12-21,12 c17.6-11.3,19.1-26.6,19.1-33.3c0-19.6,0-57.9,0-115C142,253.4,169.5,226,203.4,226z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="32.01 -0.02 447.86 511.98"><path d="M249 7.3c9.3 7 14.5 16.6 15.6 28.7l.2-.1v250.9c.2 12.8 5 23 14.4 30.5 14.1 10 28.7 11 44 2.8l-199.6 115c-14.8 7.6-29 7-42.5-2-9.3-7-14.5-16.6-15.6-28.7l-.2.1V152.3q-.75-18.45-14.4-29.4c-4.5-3.2-9-5.5-13.7-6.8-6.6-1.7-6.6-9.9-1.7-12.4 11-6.3 68-39.2 171-98.5 14.8-7.6 29-6.9 42.5 2.1" style="fill:#9de8ff"/><path d="M264.7 286.8c-.1-24.8-20.4-60.8-61.4-60.8-11.4 0-22 3-31.9 8.9l183-105.4c9.1-5.3 19.6-8.3 30.9-8.3 33.8 0 61.2 27.2 61.4 60.7v186.4c.2 12.8 5 23 14.4 30.5q6.75 4.8 13.8 6.9c6.7 2.2 6 10.1 1.6 12.4-25.4 14.6-76.6 44.2-153.5 88.6-14.8 7.6-29 7-42.5-2q-13.95-10.5-15.6-28.8l-.2.1V286.8" style="fill:#106bf3"/><path d="M203.4 226c33.9 0 61.4 27.4 61.4 61.1v66.7s-105.6 60.8-120.9 69.6c-1.2.7-21 12-21 12 17.6-11.3 19.1-26.6 19.1-33.3v-115c0-33.7 27.5-61.1 61.4-61.1" style="fill:#57aaf9"/></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 912 B