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="icon-transparent" 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:url(#inner-shape_00000083804332604323456690000012105745681037589910_);}
.st1{fill:url(#outer-shape_00000033349270080234043290000007154066654481021829_);}
</style>
<g id="icon-transparent_00000051373423334137619640000011770467959338602921_">
<linearGradient id="inner-shape_00000083063148661552556320000006429949236660692124_" gradientUnits="userSpaceOnUse" x1="97.508" y1="308.135" x2="522.0686" y2="63.019" gradientTransform="matrix(1 0 0 -1 0 514)">
<stop offset="0" style="stop-color:#AA5CC3"/>
<stop offset="1" style="stop-color:#00A4DC"/>
</linearGradient>
<path id="inner-shape" style="fill:url(#inner-shape_00000083063148661552556320000006429949236660692124_);" d="M256,196.2
c-22.4,0-94.8,131.3-83.8,153.4c11,22.1,156.8,21.9,167.7,0S278.6,196.2,256,196.2z"/>
<linearGradient id="outer-shape_00000093872899621111855210000000538147207651002804_" gradientUnits="userSpaceOnUse" x1="94.1932" y1="302.3936" x2="518.7538" y2="57.2775" gradientTransform="matrix(1 0 0 -1 0 514)">
<stop offset="0" style="stop-color:#AA5CC3"/>
<stop offset="1" style="stop-color:#00A4DC"/>
</linearGradient>
<path id="outer-shape" style="fill:url(#outer-shape_00000093872899621111855210000000538147207651002804_);" d="M256,0
C188.3,0-29.8,395.4,3.4,462.2s472.3,66,505.2,0S323.8,0,256,0z M421.6,404.3c-21.6,43.2-309.3,43.8-331.1,0S211.7,101.4,256,101.4
S443.2,361,421.6,404.3z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><linearGradient id="a" x1="97.508" x2="522.069" y1="308.135" y2="63.019" gradientTransform="matrix(1 0 0 -1 0 514)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#aa5cc3"/><stop offset="1" style="stop-color:#00a4dc"/></linearGradient><path d="M256 196.2c-22.4 0-94.8 131.3-83.8 153.4s156.8 21.9 167.7 0-61.3-153.4-83.9-153.4" style="fill:url(#a)"/><linearGradient id="b" x1="94.193" x2="518.754" y1="302.394" y2="57.278" gradientTransform="matrix(1 0 0 -1 0 514)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#aa5cc3"/><stop offset="1" style="stop-color:#00a4dc"/></linearGradient><path d="M256 0C188.3 0-29.8 395.4 3.4 462.2s472.3 66 505.2 0S323.8 0 256 0m165.6 404.3c-21.6 43.2-309.3 43.8-331.1 0S211.7 101.4 256 101.4 443.2 361 421.6 404.3" style="fill:url(#b)"/></svg>

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 896 B