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="0 71.97 511.94 367.85">
<style type="text/css">
.st0{fill:#3B3A3A;}
.st1{fill:#087FFC;}
</style>
<g>
<path class="st0" d="M405.8,396.9c-0.2,0.4-0.4,0.8-0.4,1.1c-0.9,0.2-0.8,0.6-0.4,1.1c-3.2,9.3-7.7,17.6-14.7,24.6 c-21.4,21.2-55.6,21.5-77.3,0.9c-6.2-5.9-10.6-13-13.8-21c-13.6-32.9-27-65.8-40.6-98.9c-21.2-51.6-42.5-103.2-63.7-154.8 c-7-17-6.8-34,2.5-50.1c11-18.7,27.8-28.4,49.5-27.8c21.5,0.6,37.8,11,47.6,30.1c4.7,9.3,8.1,19.1,12.1,28.7 c14.2,34.6,28.5,69.2,42.7,103.8c0.6,1.1,0.6,2.6,2.1,3.2c0,2.1,0.8,3.8,1.5,5.7C369,282.7,385,321.8,401.3,361 c4.3,10.6,6.2,21.4,4.2,32.7C405.3,394.8,405.3,395.8,405.8,396.9z"/>
<path class="st1" d="M405.8,396.9c-0.6-0.9-0.4-2.1-0.2-3c2.1-11.3,0.2-22.1-4.2-32.7c-16.3-39.1-32.3-78.3-48.4-117.4 c-0.8-1.9-1.5-3.6-1.5-5.7c18-43.7,36.1-87.3,54.1-131.2c13.4-32.7,53.1-45,82.4-25c21,14.4,29.5,41.4,20.2,65.2 c-7.6,19.3-15.7,38.2-23.4,57.5c-23.4,57.3-47.1,114.4-70.7,171.6C411.1,383.1,409.2,390.3,405.8,396.9z"/>
<path class="st1" d="M405.1,399c-0.4-0.6-0.6-0.9,0.4-1.1C405.3,398.4,405.1,398.6,405.1,399z"/>
<path class="st0" d="M211.5,361.5c-25.7-62.4-51.4-124.8-76.9-186.9c-8.9-21.2-17.4-42.3-26.3-63.3c-2.6-8.9-7.6-16.8-14.2-23.2 c-3.6-3.6-7.7-6.6-12.3-9.1c-0.2,0-0.4-0.2-0.4-0.2c-0.9-0.6-1.9-0.9-3-1.5c-0.8-0.4-1.5-0.6-2.1-0.9c-0.4-0.2-0.8-0.4-1.1-0.4 c-6.2-2.5-12.9-3.8-19.8-3.8c-0.2,0-0.4,0-0.4,0c-0.4,0-0.9,0-1.3,0c-0.6,0-1.1,0-1.7,0c-0.6,0-1.1,0-1.7,0 C38.9,73.1,28.5,77.6,20,84.8C7.7,95.2,0,110.5,0,127.5c0,9.5,2.5,18.5,6.6,26.3c32.1,77.9,64.1,155.6,96,233.3 c3,7.2,5.9,14.6,9.1,21.7c9.6,19.8,30.6,32.1,52.4,30.8c22.7-1.5,41.8-15.9,49.1-37C218.1,388.6,217,375,211.5,361.5z"/>
</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 71.97 511.94 367.85"><style>.st0{fill:#3b3a3a}.st1{fill:#087ffc}</style><path d="M405.8 396.9c-.2.4-.4.8-.4 1.1-.9.2-.8.6-.4 1.1-3.2 9.3-7.7 17.6-14.7 24.6-21.4 21.2-55.6 21.5-77.3.9-6.2-5.9-10.6-13-13.8-21-13.6-32.9-27-65.8-40.6-98.9-21.2-51.6-42.5-103.2-63.7-154.8-7-17-6.8-34 2.5-50.1 11-18.7 27.8-28.4 49.5-27.8 21.5.6 37.8 11 47.6 30.1 4.7 9.3 8.1 19.1 12.1 28.7 14.2 34.6 28.5 69.2 42.7 103.8.6 1.1.6 2.6 2.1 3.2 0 2.1.8 3.8 1.5 5.7C369 282.7 385 321.8 401.3 361c4.3 10.6 6.2 21.4 4.2 32.7-.2 1.1-.2 2.1.3 3.2" class="st0"/><path d="M405.8 396.9c-.6-.9-.4-2.1-.2-3 2.1-11.3.2-22.1-4.2-32.7-16.3-39.1-32.3-78.3-48.4-117.4-.8-1.9-1.5-3.6-1.5-5.7 18-43.7 36.1-87.3 54.1-131.2 13.4-32.7 53.1-45 82.4-25 21 14.4 29.5 41.4 20.2 65.2-7.6 19.3-15.7 38.2-23.4 57.5-23.4 57.3-47.1 114.4-70.7 171.6-3 6.9-4.9 14.1-8.3 20.7M405.1 399c-.4-.6-.6-.9.4-1.1-.2.5-.4.7-.4 1.1" class="st1"/><path d="M211.5 361.5c-25.7-62.4-51.4-124.8-76.9-186.9-8.9-21.2-17.4-42.3-26.3-63.3-2.6-8.9-7.6-16.8-14.2-23.2-3.6-3.6-7.7-6.6-12.3-9.1-.2 0-.4-.2-.4-.2-.9-.6-1.9-.9-3-1.5-.8-.4-1.5-.6-2.1-.9-.4-.2-.8-.4-1.1-.4-6.2-2.5-12.9-3.8-19.8-3.8h-5.1c-11.4.9-21.8 5.4-30.3 12.6C7.7 95.2 0 110.5 0 127.5c0 9.5 2.5 18.5 6.6 26.3 32.1 77.9 64.1 155.6 96 233.3 3 7.2 5.9 14.6 9.1 21.7 9.6 19.8 30.6 32.1 52.4 30.8 22.7-1.5 41.8-15.9 49.1-37 4.9-14 3.8-27.6-1.7-41.1" class="st0"/></svg>

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB