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,24 +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 41.49 512 429.11">
<style type="text/css">
.st0{fill:#95C980;}
.st1{fill:#72B755;}
.st2{fill:#4FA52B;}
.st3{fill:#EE8C89;}
.st4{fill:#E96562;}
.st5{fill:#E33F3B;}
.st6{fill:#EFB075;}
.st7{fill:#E99547;}
.st8{fill:#E47B19;}
</style>
<g>
<path class="st0" d="M407.9,213.9c-45.6,32.6-110.4,25.9-151.7,12.8l30-23.9l28.6-22.9l99.4-79.6L310.5,173l-29,20.3l-30.2,21.3 c1.4-42.9,14.2-101.1,57.9-132.5c3.6-2.6,7.9-5.3,12.4-7.7c5.5-3,11.5-5.9,17.8-8.3C394.3,43.5,478.2,35,512,46.8 c0.2,32.8-32.2,91.9-68.7,133.5c-4.9,5.7-9.9,10.9-15,15.8C421.5,203.1,414.6,209,407.9,213.9L407.9,213.9z"/>
<path class="st1" d="M428.6,196.3c-45,25.5-104.1,18.8-142.4,6.5l28.6-22.9l99.4-79.6L310.5,173l-29,20.3 c1-36.7,9.9-85.3,39.9-118.7c5.5-3,11.5-5.9,17.8-8.3C394.1,43.8,478,35.2,511.8,47c0.2,32.8-32.2,91.9-68.7,133.5 C438.5,186.1,433.4,191.4,428.6,196.3L428.6,196.3z"/>
<path class="st2" d="M443.5,180.5c-42.7,17.4-94.4,10.7-129-0.4l99.6-79.8L310.5,173c0.6-32,7.1-74.1,29-106.9 C394.3,43.5,478.2,35,512,46.8C512.2,79.6,479.8,138.7,443.5,180.5z"/>
<path class="st3" d="M213.1,348.2c-11.7-42.5,10.5-88.7,31.4-115.8l9.7,28.8l9.1,27.1l32.2,95.2L269.6,287l-7.3-26.7l-7.5-28.2 c31.4,12.6,71.1,37.7,82.4,78.6c1,3.4,1.8,7.3,2.4,11.1c0.8,4.9,1.2,10.1,1.4,15.6c1.8,46.8-14.4,111.2-32.2,133.1 c-24.3-8.7-59.3-48.6-80.4-86.7c-2.8-5.3-5.5-10.3-7.7-15.4C217.5,361.3,214.9,354.6,213.1,348.2L213.1,348.2z"/>
<path class="st4" d="M220.6,368.2c-6.9-40.1,14-82,33.6-107.1l9.1,27.1l32.2,95.2L269.6,287l-7.3-26.7 c26.9,10.5,60.6,30.4,77.2,61.6c0.8,4.9,1.2,10.1,1.4,15.6c1.8,46.8-14.4,111.2-32.2,133.1c-24.3-8.7-59.3-48.6-80.4-86.7 C225.4,378.5,222.8,373.3,220.6,368.2L220.6,368.2z"/>
<path class="st5" d="M228.3,383.6c-1.4-36.5,17.4-72.7,35-95.4l32.2,95.2L269.6,287c23.5,8.9,52.9,25.1,71.3,50.2 c1.8,46.8-14.4,111.2-32.2,133.1C284.4,461.6,249.3,421.7,228.3,383.6L228.3,383.6z"/>
<path class="st6" d="M171.7,105.3c43.9,22.1,65.6,74.1,72.5,111.2l-30.8-13.4l-29.4-12.8L81.6,145.8l98.8,50.4l27.5,14l29,14.8 c-33.6,16-83.6,29.4-125.8,8.3c-3.6-1.8-7.3-3.8-10.9-6.5c-4.7-3-9.1-6.5-13.8-10.3C46.2,183.3,4.9,122.5,0,92 c25.1-13.2,84.1-11.7,131.2-0.6c6.5,1.6,12.6,3.2,18.4,5.1C157.8,99,165.1,102.1,171.7,105.3L171.7,105.3z"/>
<path class="st7" d="M149.7,96.6c38.3,24.3,57.5,72.1,64,106.5l-29.4-12.8L81.8,145.8l98.6,50.4l27.5,14 c-28.6,13.8-69.9,26.3-107.9,16.6c-4.7-3-9.1-6.5-13.8-10.3C46.2,183.3,4.9,122.5,0,92c25.1-13.2,84.1-11.7,131.2-0.6 C137.5,93,143.8,94.6,149.7,96.6z"/>
<path class="st8" d="M131.2,91.3c31,25.9,47.2,68.1,52.9,99L81.6,145.8l98.8,50.4c-24.7,12.2-59.9,23.9-94.2,20.3 C46.2,183.3,4.9,122.5,0,92C25.1,78.8,84.1,80.2,131.2,91.3z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 41.49 512 429.11"><path d="M407.9 213.9c-45.6 32.6-110.4 25.9-151.7 12.8l30-23.9 28.6-22.9 99.4-79.6L310.5 173l-29 20.3-30.2 21.3c1.4-42.9 14.2-101.1 57.9-132.5 3.6-2.6 7.9-5.3 12.4-7.7 5.5-3 11.5-5.9 17.8-8.3C394.3 43.5 478.2 35 512 46.8c.2 32.8-32.2 91.9-68.7 133.5-4.9 5.7-9.9 10.9-15 15.8-6.8 7-13.7 12.9-20.4 17.8" style="fill:#95c980"/><path d="M428.6 196.3c-45 25.5-104.1 18.8-142.4 6.5l28.6-22.9 99.4-79.6L310.5 173l-29 20.3c1-36.7 9.9-85.3 39.9-118.7 5.5-3 11.5-5.9 17.8-8.3C394.1 43.8 478 35.2 511.8 47c.2 32.8-32.2 91.9-68.7 133.5-4.6 5.6-9.7 10.9-14.5 15.8" style="fill:#72b755"/><path d="M443.5 180.5c-42.7 17.4-94.4 10.7-129-.4l99.6-79.8L310.5 173c.6-32 7.1-74.1 29-106.9C394.3 43.5 478.2 35 512 46.8c.2 32.8-32.2 91.9-68.5 133.7" style="fill:#4fa52b"/><path d="M213.1 348.2c-11.7-42.5 10.5-88.7 31.4-115.8l9.7 28.8 9.1 27.1 32.2 95.2-25.9-96.5-7.3-26.7-7.5-28.2c31.4 12.6 71.1 37.7 82.4 78.6 1 3.4 1.8 7.3 2.4 11.1.8 4.9 1.2 10.1 1.4 15.6 1.8 46.8-14.4 111.2-32.2 133.1-24.3-8.7-59.3-48.6-80.4-86.7-2.8-5.3-5.5-10.3-7.7-15.4-3.2-7.1-5.8-13.8-7.6-20.2" style="fill:#ee8c89"/><path d="M220.6 368.2c-6.9-40.1 14-82 33.6-107.1l9.1 27.1 32.2 95.2-25.9-96.4-7.3-26.7c26.9 10.5 60.6 30.4 77.2 61.6.8 4.9 1.2 10.1 1.4 15.6 1.8 46.8-14.4 111.2-32.2 133.1-24.3-8.7-59.3-48.6-80.4-86.7-2.9-5.4-5.5-10.6-7.7-15.7" style="fill:#e96562"/><path d="M228.3 383.6c-1.4-36.5 17.4-72.7 35-95.4l32.2 95.2-25.9-96.4c23.5 8.9 52.9 25.1 71.3 50.2 1.8 46.8-14.4 111.2-32.2 133.1-24.3-8.7-59.4-48.6-80.4-86.7" style="fill:#e33f3b"/><path d="M171.7 105.3c43.9 22.1 65.6 74.1 72.5 111.2l-30.8-13.4-29.4-12.8-102.4-44.5 98.8 50.4 27.5 14 29 14.8c-33.6 16-83.6 29.4-125.8 8.3-3.6-1.8-7.3-3.8-10.9-6.5-4.7-3-9.1-6.5-13.8-10.3C46.2 183.3 4.9 122.5 0 92c25.1-13.2 84.1-11.7 131.2-.6 6.5 1.6 12.6 3.2 18.4 5.1 8.2 2.5 15.5 5.6 22.1 8.8" style="fill:#efb075"/><path d="M149.7 96.6c38.3 24.3 57.5 72.1 64 106.5l-29.4-12.8-102.5-44.5 98.6 50.4 27.5 14C179.3 224 138 236.5 100 226.8c-4.7-3-9.1-6.5-13.8-10.3C46.2 183.3 4.9 122.5 0 92c25.1-13.2 84.1-11.7 131.2-.6 6.3 1.6 12.6 3.2 18.5 5.2" style="fill:#e99547"/><path d="M131.2 91.3c31 25.9 47.2 68.1 52.9 99L81.6 145.8l98.8 50.4c-24.7 12.2-59.9 23.9-94.2 20.3C46.2 183.3 4.9 122.5 0 92c25.1-13.2 84.1-11.8 131.2-.7" style="fill:#e47b19"/></svg>

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB