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,25 +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 0.1 512 511.8">
<style type="text/css">
.st0{fill:#B51F08;}
.st1{fill:#FDD49A;}
.st2{fill:url(#SVGID_1_);}
.st3{fill:none;}
.st4{fill:#010007;}
.st5{fill:#FFFFFA;}
</style>
<g>
<path class="st0" d="M486.1,282l25.9-25.9l-25.9-25.9l19.5-31l-31-19.5l12.1-34.6L452,132.9l4.1-36.4l-36.4-4.1l-4.1-36.4L379.2,60 l-12.1-34.6l-34.6,12.1L313,6.5l-31,19.5L256,0.1L230.1,26L199,6.5l-19.5,31l-34.6-12.1L132.8,60l-36.4-4.1l-4.1,36.4l-36.4,4.1 l4.1,36.4L25.4,145l12.1,34.6l-31,19.5l19.5,31L0,256.1L25.9,282l-19.5,31l31,19.5l-12.1,34.6L60,379.3l-4.1,36.4l36.4,4.1 l4.1,36.4l36.4-4.1l12.1,34.6l34.6-12.1l19.5,31l31-19.5l25.9,25.7l25.9-25.7l31,19.5l19.5-31l34.6,12.1l12.1-34.6l36.4,4.1 l4.1-36.4l36.4-4.1l-4.1-36.4l34.6-12.1l-12.1-34.6l31-19.5L486.1,282z"/>
<path class="st1" d="M433.6,297.1c0-50.1-40.6-90.7-90.7-90.7c-24.9,0-47.4,10-63.8,26.3l0,0l-23.1,23.1L237,236.8 c-16.6-19-41-31-68.2-31c-50.1,0-90.7,40.6-90.7,90.7c0,26.2,11.1,49.8,28.8,66.3l149.1,149L401.8,366 C420,348.9,433.6,324.7,433.6,297.1"/>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-54.6221" y1="648.5983" x2="-52.0276" y2="648.5983" gradientTransform="matrix(26.5564 -55.7693 -55.7693 -26.5564 37784.3516 14582.9385)">
<stop offset="0" style="stop-color:#FDD49A"/>
<stop offset="1" style="stop-color:#DCA055"/>
</linearGradient>
<path class="st2" d="M255.9,255.7L237,236.8c-16.6-19-41-31-68.2-31c-50.1,0-90.7,40.6-90.7,90.7c0,26.2,11.1,49.8,28.8,66.3 l149.1,149"/>
<path class="st3" d="M256,511.9l-0.1-256.2"/>
<path class="st4" d="M281.9,486.1c-6.9-6.9-16.2-10.8-25.9-10.8c-9.7,0-19.1,3.9-26,10.8c0.1,14.2,11.7,25.8,25.9,25.8 C270.2,511.9,281.8,500.4,281.9,486.1 M225.6,329.3c0,11-8.9,19.8-19.8,19.8s-19.8-8.9-19.8-19.8c0-11,8.9-19.8,19.8-19.8 S225.6,318.3,225.6,329.3L225.6,329.3"/>
<path class="st5" d="M218.8,326.3c0,3-2.5,5.5-5.5,5.5c0,0,0,0,0,0c-3,0-5.5-2.5-5.5-5.5c0-3,2.5-5.5,5.5-5.5 C216.4,320.8,218.8,323.3,218.8,326.3"/>
<path class="st4" d="M326.2,329.3c0,11-8.9,19.8-19.8,19.8c-11,0-19.8-8.9-19.8-19.8s8.9-19.8,19.8-19.8 C317.3,309.4,326.2,318.3,326.2,329.3"/>
<path class="st5" d="M319.4,326.3c0,3-2.5,5.5-5.5,5.5c-3,0-5.5-2.5-5.5-5.5c0-3,2.5-5.5,5.5-5.5 C317,320.8,319.4,323.3,319.4,326.3"/>
</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 0.1 512 511.8"><style>.st4{fill:#010007}.st5{fill:#fffffa}</style><path d="m486.1 282 25.9-25.9-25.9-25.9 19.5-31-31-19.5 12.1-34.6-34.7-12.2 4.1-36.4-36.4-4.1-4.1-36.4-36.4 4-12.1-34.6-34.6 12.1-19.5-31L282 26 256 .1 230.1 26 199 6.5l-19.5 31-34.6-12.1L132.8 60l-36.4-4.1-4.1 36.4-36.4 4.1 4.1 36.4L25.4 145l12.1 34.6-31 19.5 19.5 31-26 26L25.9 282 6.4 313l31 19.5-12.1 34.6L60 379.3l-4.1 36.4 36.4 4.1 4.1 36.4 36.4-4.1 12.1 34.6 34.6-12.1 19.5 31 31-19.5 25.9 25.7 25.9-25.7 31 19.5 19.5-31 34.6 12.1 12.1-34.6 36.4 4.1 4.1-36.4 36.4-4.1-4.1-36.4 34.6-12.1-12.1-34.6 31-19.5z" style="fill:#b51f08"/><path d="M433.6 297.1c0-50.1-40.6-90.7-90.7-90.7-24.9 0-47.4 10-63.8 26.3L256 255.8l-19-19c-16.6-19-41-31-68.2-31-50.1 0-90.7 40.6-90.7 90.7 0 26.2 11.1 49.8 28.8 66.3l149.1 149L401.8 366c18.2-17.1 31.8-41.3 31.8-68.9" style="fill:#fdd49a"/><linearGradient id="SVGID_1_" x1="-54.622" x2="-52.028" y1="648.598" y2="648.598" gradientTransform="scale(61.7694 -61.7694)rotate(64.537 492.804 366.353)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#fdd49a"/><stop offset="1" style="stop-color:#dca055"/></linearGradient><path d="M255.9 255.7 237 236.8c-16.6-19-41-31-68.2-31-50.1 0-90.7 40.6-90.7 90.7 0 26.2 11.1 49.8 28.8 66.3l149.1 149" style="fill:url(#SVGID_1_)"/><path d="m256 511.9-.1-256.2" style="fill:none"/><path d="M281.9 486.1c-6.9-6.9-16.2-10.8-25.9-10.8s-19.1 3.9-26 10.8c.1 14.2 11.7 25.8 25.9 25.8 14.3 0 25.9-11.5 26-25.8m-56.3-156.8c0 11-8.9 19.8-19.8 19.8s-19.8-8.9-19.8-19.8c0-11 8.9-19.8 19.8-19.8s19.8 8.8 19.8 19.8" class="st4"/><path d="M218.8 326.3c0 3-2.5 5.5-5.5 5.5s-5.5-2.5-5.5-5.5 2.5-5.5 5.5-5.5c3.1 0 5.5 2.5 5.5 5.5" class="st5"/><path d="M326.2 329.3c0 11-8.9 19.8-19.8 19.8-11 0-19.8-8.9-19.8-19.8s8.9-19.8 19.8-19.8c10.9-.1 19.8 8.8 19.8 19.8" class="st4"/><path d="M319.4 326.3c0 3-2.5 5.5-5.5 5.5s-5.5-2.5-5.5-5.5 2.5-5.5 5.5-5.5c3.1 0 5.5 2.5 5.5 5.5" class="st5"/></svg>

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB