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,8 +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 30.56 512 450.84">
<style type="text/css">
.st0{fill:#1185FE;}
</style>
<g>
<path class="st0" d="M111,60.9c58.7,44.1,121.8,133.4,145,181.4c23.2-47.9,86.3-137.3,145-181.4c42.4-31.8,111-56.4,111,21.9 c0,15.6-9,131.3-14.2,150.1c-18.3,65.3-84.9,82-144.1,71.9c103.5,17.6,129.9,76,73,134.4c-108,110.9-155.3-27.8-167.4-63.4 c-2.2-6.5-3.3-9.6-3.3-7c0-2.6-1.1,0.5-3.3,7c-12.1,35.5-59.4,174.2-167.4,63.4c-56.9-58.4-30.5-116.8,73-134.4 C99.1,314.9,32.5,298.3,14.2,233C9,214.2,0,98.5,0,82.8C0,4.5,68.6,29.1,111,60.9L111,60.9z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 30.56 512 450.84"><path d="M111 60.9c58.7 44.1 121.8 133.4 145 181.4 23.2-47.9 86.3-137.3 145-181.4 42.4-31.8 111-56.4 111 21.9 0 15.6-9 131.3-14.2 150.1-18.3 65.3-84.9 82-144.1 71.9 103.5 17.6 129.9 76 73 134.4-108 110.9-155.3-27.8-167.4-63.4-2.2-6.5-3.3-9.6-3.3-7 0-2.6-1.1.5-3.3 7-12.1 35.5-59.4 174.2-167.4 63.4-56.9-58.4-30.5-116.8 73-134.4-59.2 10.1-125.8-6.5-144.1-71.8C9 214.2 0 98.5 0 82.8 0 4.5 68.6 29.1 111 60.9" style="fill:#1185fe"/></svg>

Before

Width:  |  Height:  |  Size: 737 B

After

Width:  |  Height:  |  Size: 525 B