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
+1 -26
View File
@@ -1,26 +1 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.7.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
<style type="text/css">
.st0{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
.st1{fill:url(#SVGID_00000060725655691427528170000001948040236100154297_);}
</style>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="461.2312" y1="52.5727" x2="131.7846" y2="620.7087" gradientTransform="matrix(1 0 0 -1 0 514)">
<stop offset="6.601250e-02" style="stop-color:#8EFFEE"/>
<stop offset="0.4499" style="stop-color:#C9C7FF"/>
<stop offset="1" style="stop-color:#7341FF"/>
</linearGradient>
<path class="st0" d="M205.7,460.4c19.5,35,69.4,36.9,91.5,3.5l206-311.5c21.8-33,0.9-77.3-38.6-81.8L59.7,24.5
c-43.2-4.9-73.9,40.6-52.9,78.4l1.6,2.9l180.7,123.8l-2.2,196.9L205.7,460.4z"/>
<radialGradient id="SVGID_00000086649422102996863750000013901187830862373563_" cx="-46.2205" cy="659.9597" r="18.2857" gradientTransform="matrix(-1.8724 28.5262 36.7876 2.4146 -24147.166 -316.2381)" gradientUnits="userSpaceOnUse">
<stop offset="0.4031" style="stop-color:#6D4AFF"/>
<stop offset="0.9944" style="stop-color:#00F0C3"/>
</radialGradient>
<path style="fill:url(#SVGID_00000086649422102996863750000013901187830862373563_);" d="M217.3,427.8l18.3-27.3l138.9-209.8
c12.1-18.3,0.6-42.9-21.4-45.5L8.4,105.7l178.5,320.9C193.4,438.2,209.9,438.8,217.3,427.8z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><linearGradient id="a" x1="461.231" x2="131.785" y1="52.573" y2="620.709" gradientTransform="matrix(1 0 0 -1 0 514)" gradientUnits="userSpaceOnUse"><stop offset=".066" style="stop-color:#8effee"/><stop offset=".45" style="stop-color:#c9c7ff"/><stop offset="1" style="stop-color:#7341ff"/></linearGradient><path d="M205.7 460.4c19.5 35 69.4 36.9 91.5 3.5l206-311.5c21.8-33 .9-77.3-38.6-81.8L59.7 24.5c-43.2-4.9-73.9 40.6-52.9 78.4l1.6 2.9 180.7 123.8-2.2 196.9z" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#a)"/><radialGradient id="b" cx="-46.221" cy="659.96" r="18.286" gradientTransform="matrix(-1.8724 28.5262 36.7876 2.4146 -24147.166 -316.238)" gradientUnits="userSpaceOnUse"><stop offset=".403" style="stop-color:#6d4aff"/><stop offset=".994" style="stop-color:#00f0c3"/></radialGradient><path d="m217.3 427.8 18.3-27.3 138.9-209.8c12.1-18.3.6-42.9-21.4-45.5L8.4 105.7l178.5 320.9c6.5 11.6 23 12.2 30.4 1.2" style="fill:url(#b)"/></svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB