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 140.2 512 231.6">
<style type="text/css">
.st0{fill:#FFFFFF;}
.st1{fill:#F4811F;}
.st2{fill:#FAAD3F;}
</style>
<g transform="translate(0 -1)">
<path class="st0" d="M404.7,240l-10.6-4.2c-49.9,112.3-248.5,44-260.5,77.5c-2,22.6,108.5,4.3,187.4,8.1 c24.1,1.2,36.2,19.3,25.9,49l20.1,0.1c23.2-72.4,97.4-35.5,100.5-59.4C462.5,295.3,382.4,311,404.7,240z"/>
<path class="st1" d="M352.7,357.9c3.2-10.6,2.1-21.2-3.2-27.6c-5.3-6.4-12.7-10.6-22.3-11.7l-184.8-2.1c-1.1,0-2.1-1.1-3.2-1.1 c-1.1-1.1-1.1-2.1,0-3.2c1.1-2.1,2.1-3.2,4.2-3.2l185.9-2.1c22.3-1.1,45.7-19.1,54.2-40.4l10.6-27.6c0-1.1,1.1-2.1,0-3.2 c-11.7-54.2-60.5-94.5-117.9-94.5c-53.1,0-98.8,34-114.7,81.8c-10.6-7.4-23.4-11.7-38.2-10.6c-25.5,2.1-45.7,23.4-48.9,48.9 c-1.1,6.4,0,12.7,1.1,19.1C34,281.4,0,315.4,0,357.9c0,4.2,0,7.4,1.1,11.7c0,2.1,2.1,3.2,3.2,3.2h341c2.1,0,4.3-1.1,4.3-3.2 L352.7,357.9z"/>
<path class="st2" d="M411.1,238.9h-5.3c-1.1,0-2.1,1.1-3.2,2.1l-7.4,25.5c-3.2,10.6-2.1,21.2,3.2,27.6c5.3,6.4,12.7,10.6,22.3,11.7 L460,308c1.1,0,2.1,1.1,3.2,1.1c1.1,1.1,1.1,2.1,0,3.2c-1.1,2.1-2.1,3.2-4.2,3.2l-40.4,2.1c-22.3,1.1-45.7,19.1-54.2,40.4l-2.1,9.6 c-1.1,1.1,0,3.2,2.1,3.2h140.2c2.1,0,3.2-1.1,3.2-3.2c2.1-8.5,4.2-18.1,4.2-27.6C512,284.6,466.3,238.9,411.1,238.9"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 140.2 512 231.6"><path d="m404.7 240-10.6-4.2c-49.9 112.3-248.5 44-260.5 77.5-2 22.6 108.5 4.3 187.4 8.1 24.1 1.2 36.2 19.3 25.9 49l20.1.1c23.2-72.4 97.4-35.5 100.5-59.4-5-15.8-85.1-.1-62.8-71.1" style="fill:#fff" transform="translate(0 -1)"/><path d="M352.7 357.9c3.2-10.6 2.1-21.2-3.2-27.6s-12.7-10.6-22.3-11.7l-184.8-2.1c-1.1 0-2.1-1.1-3.2-1.1-1.1-1.1-1.1-2.1 0-3.2 1.1-2.1 2.1-3.2 4.2-3.2l185.9-2.1c22.3-1.1 45.7-19.1 54.2-40.4l10.6-27.6c0-1.1 1.1-2.1 0-3.2-11.7-54.2-60.5-94.5-117.9-94.5-53.1 0-98.8 34-114.7 81.8-10.6-7.4-23.4-11.7-38.2-10.6-25.5 2.1-45.7 23.4-48.9 48.9-1.1 6.4 0 12.7 1.1 19.1-41.5 1-75.5 35-75.5 77.5 0 4.2 0 7.4 1.1 11.7 0 2.1 2.1 3.2 3.2 3.2h341c2.1 0 4.3-1.1 4.3-3.2z" style="fill:#f4811f" transform="translate(0 -1)"/><path d="M411.1 238.9h-5.3c-1.1 0-2.1 1.1-3.2 2.1l-7.4 25.5c-3.2 10.6-2.1 21.2 3.2 27.6s12.7 10.6 22.3 11.7L460 308c1.1 0 2.1 1.1 3.2 1.1 1.1 1.1 1.1 2.1 0 3.2-1.1 2.1-2.1 3.2-4.2 3.2l-40.4 2.1c-22.3 1.1-45.7 19.1-54.2 40.4l-2.1 9.6c-1.1 1.1 0 3.2 2.1 3.2h140.2c2.1 0 3.2-1.1 3.2-3.2 2.1-8.5 4.2-18.1 4.2-27.6 0-55.4-45.7-101.1-100.9-101.1" style="fill:#faad3f" transform="translate(0 -1)"/></svg>

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB