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,20 +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-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
</style>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="1303.5114" y1="-5320.0098" x2="4878.1035" y2="-1489.2896" gradientTransform="matrix(9.752000e-02 0 0 -9.752000e-02 -45.2065 -76.2454)">
<stop offset="0" style="stop-color:#7266F0"/>
<stop offset="1" style="stop-color:#734ED3"/>
</linearGradient>
<circle class="st0" cx="256" cy="256" r="256"/>
<path class="st1" d="M256.4,198.6c-14.9,0-86,55.4-98.2,55.4c-13.1,0-95.5-31.8-105-25.5C48,240,134,330.1,157.4,330.1
c23,0,91.1-48,99-48c7.9,0,76,48,99,48c23.4,0,109.4-90.1,104.1-101.5c-9.5-6.5-91.9,25.5-105,25.5
C342.5,254.1,271.3,198.6,256.4,198.6z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><linearGradient id="a" x1="1303.511" x2="4878.104" y1="-5320.01" y2="-1489.29" gradientTransform="matrix(.09752 0 0 -.09752 -45.206 -76.245)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#7266f0"/><stop offset="1" style="stop-color:#734ed3"/></linearGradient><circle cx="256" cy="256" r="256" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#a)"/><path d="M256.4 198.6c-14.9 0-86 55.4-98.2 55.4-13.1 0-95.5-31.8-105-25.5C48 240 134 330.1 157.4 330.1c23 0 91.1-48 99-48s76 48 99 48c23.4 0 109.4-90.1 104.1-101.5-9.5-6.5-91.9 25.5-105 25.5-12 0-83.2-55.5-98.1-55.5" style="fill-rule:evenodd;clip-rule:evenodd;fill:#fff"/></svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 733 B