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,10 +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="13.74 0.01 484.55 511.99">
<style type="text/css">
.st0{fill:#5DCF3F;}
</style>
<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)">
<g>
<path class="st0" d="M4337.6,5113.5c-25.1-1.1-128-9.1-228.6-16c-1144.3-76.6-2165.2-369.2-2840.8-811.7 c-244.6-160-503-393.3-652.8-587.6c-136-176.1-257.2-395.5-335-602.5c-168-450.4-188.6-1006-58.3-1603.9 c33.2-155.5,115.5-441.3,165.8-578.5l34.3-90.3L389,739.6c-44.6-112-130.3-372.7-155.5-471c-24-94.9-17.1-149.8,25.2-200.1 C299.8,19.4,343.3,0,413,0c76.6,0,133.8,35.4,160,99.5c10.3,24,42.3,121.2,72,214.9c29.7,94.9,82.3,243.5,116.6,331.5 c82.3,210.3,296.1,643.6,420.7,851.7c384.1,640.2,863.1,1167.2,1421,1563.9c157.8,113.2,185.2,146.3,185.2,232.1 c0,88-59.4,162.3-145.2,181.8c-67.4,16-125.8-8-261.8-104c-676.8-483.6-1216.3-1103.2-1654.2-1901.1l-75.5-136l-11.4,44.6 C528.5,1806.2,493,2140,525,2459c46.9,459.6,217.2,835.7,524.7,1155.8c325.8,339.5,743.1,584.2,1333,780.8 c514.4,171.5,1180.9,293.8,1822.2,332.7l130.3,8l-36.6-61.7c-192.1-324.7-316.7-719.1-378.4-1204.9 c-26.3-204.6-45.7-521.3-45.7-733.9c0-549.9-153.2-971.7-460.7-1268.9C3152.1,1212.9,2832,1072.3,2337,992.3 c-128-21.7-203.5-25.2-554.4-26.3c-453.8-2.3-455-2.3-504.1-82.3c-34.3-54.9-36.6-142.9-3.4-197.8c12.6-21.7,45.7-52.6,74.3-68.6 l50.3-28.6h383c416.1,0,512.1,8,794.5,64c507.6,100.6,919.1,320.1,1201.5,641.3c308.7,349.8,473.3,849.4,473.3,1437 c0,312.1,32,676.8,81.2,934c96,503,299.5,920.3,533.9,1090.6c48,34.3,85.7,72,97.2,97.2c41.2,85.7,11.4,197.8-64,244.6 c-36.6,22.9-53.7,24-277.8,21.7C4490.7,5118,4362.7,5115.8,4337.6,5113.5z"/>
</g>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="13.74 0.01 484.55 511.99"><path d="M4337.6 5113.5c-25.1-1.1-128-9.1-228.6-16-1144.3-76.6-2165.2-369.2-2840.8-811.7-244.6-160-503-393.3-652.8-587.6-136-176.1-257.2-395.5-335-602.5-168-450.4-188.6-1006-58.3-1603.9 33.2-155.5 115.5-441.3 165.8-578.5l34.3-90.3-33.2-83.4c-44.6-112-130.3-372.7-155.5-471-24-94.9-17.1-149.8 25.2-200.1C299.8 19.4 343.3 0 413 0c76.6 0 133.8 35.4 160 99.5 10.3 24 42.3 121.2 72 214.9 29.7 94.9 82.3 243.5 116.6 331.5 82.3 210.3 296.1 643.6 420.7 851.7 384.1 640.2 863.1 1167.2 1421 1563.9 157.8 113.2 185.2 146.3 185.2 232.1 0 88-59.4 162.3-145.2 181.8-67.4 16-125.8-8-261.8-104-676.8-483.6-1216.3-1103.2-1654.2-1901.1l-75.5-136-11.4 44.6C528.5 1806.2 493 2140 525 2459c46.9 459.6 217.2 835.7 524.7 1155.8 325.8 339.5 743.1 584.2 1333 780.8 514.4 171.5 1180.9 293.8 1822.2 332.7l130.3 8-36.6-61.7c-192.1-324.7-316.7-719.1-378.4-1204.9-26.3-204.6-45.7-521.3-45.7-733.9 0-549.9-153.2-971.7-460.7-1268.9-261.7-254-581.8-394.6-1076.8-474.6-128-21.7-203.5-25.2-554.4-26.3-453.8-2.3-455-2.3-504.1-82.3-34.3-54.9-36.6-142.9-3.4-197.8 12.6-21.7 45.7-52.6 74.3-68.6l50.3-28.6h383c416.1 0 512.1 8 794.5 64 507.6 100.6 919.1 320.1 1201.5 641.3 308.7 349.8 473.3 849.4 473.3 1437 0 312.1 32 676.8 81.2 934 96 503 299.5 920.3 533.9 1090.6 48 34.3 85.7 72 97.2 97.2 41.2 85.7 11.4 197.8-64 244.6-36.6 22.9-53.7 24-277.8 21.7-131.8-1.1-259.8-3.3-284.9-5.6" style="fill:#5dcf3f" transform="matrix(.1 0 0 -.1 0 512)"/></svg>

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB