fix: resolve merge conflicts
This commit is contained in:
Dashboard Icons Bot
committed by
Bjorn Lammers
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
+1
-73
@@ -1,73 +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:url(#SVGID_1_);}
|
||||
.st1{fill:url(#SVGID_00000171698694086148498680000010884703000993392051_);}
|
||||
.st2{fill:url(#SVGID_00000023959727833124329110000007871219489835881379_);}
|
||||
.st3{fill:url(#SVGID_00000158747057209154658830000002712194015220926640_);}
|
||||
.st4{fill:url(#SVGID_00000035521831490091487380000010641744180283557801_);}
|
||||
.st5{fill:url(#SVGID_00000047037058609111910930000013167352341997962129_);}
|
||||
.st6{fill:url(#SVGID_00000155110056484935481500000005605411110412298397_);}
|
||||
</style>
|
||||
<g>
|
||||
|
||||
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-78.147" y1="344.5825" x2="-177.3521" y2="257.7166" gradientTransform="matrix(2.314322e-16 -3.7796 -3.7796 -2.314322e-16 1396.5288 -224.1992)">
|
||||
<stop offset="0" style="stop-color:#FF8AA1"/>
|
||||
<stop offset="1" style="stop-color:#FFD850"/>
|
||||
</linearGradient>
|
||||
<path class="st0" d="M0,256L0,256C0,114.6,114.6,0,256,0l0,0c141.4,0,256,114.6,256,256l0,0c0,141.4-114.6,256-256,256l0,0
|
||||
C114.6,512,0,397.4,0,256z"/>
|
||||
|
||||
<linearGradient id="SVGID_00000042735347050557586020000015889334149790877849_" gradientUnits="userSpaceOnUse" x1="-83.9157" y1="335.3299" x2="-196.0488" y2="249.1397" gradientTransform="matrix(2.024893e-16 -3.3069 -3.3083 -2.025726e-16 1222.4978 -207.2896)">
|
||||
<stop offset="0" style="stop-color:#F9F9F9"/>
|
||||
<stop offset="1" style="stop-color:#FFFFFF;stop-opacity:0.973"/>
|
||||
</linearGradient>
|
||||
<path style="fill:url(#SVGID_00000042735347050557586020000015889334149790877849_);" d="M31.9,256L31.9,256
|
||||
c0-123.7,100.3-224,224-224h0.2c123.7,0,224,100.3,224,224l0,0c0,123.7-100.3,224-224,224h-0.2C132.2,480,31.9,379.7,31.9,256z"/>
|
||||
|
||||
<linearGradient id="SVGID_00000095323428672174511640000010998674275539754133_" gradientUnits="userSpaceOnUse" x1="-106.9871" y1="323.4453" x2="-203.494" y2="238.8271" gradientTransform="matrix(1.750299e-16 -2.8585 -2.8596 -1.751016e-16 1056.8538 -191.2496)">
|
||||
<stop offset="0" style="stop-color:#857679"/>
|
||||
<stop offset="1" style="stop-color:#110C0C"/>
|
||||
</linearGradient>
|
||||
<path style="fill:url(#SVGID_00000095323428672174511640000010998674275539754133_);" d="M62.3,256L62.3,256
|
||||
c0-106.9,86.7-193.6,193.6-193.6h0.2c106.9,0,193.6,86.7,193.6,193.6l0,0c0,106.9-86.7,193.6-193.6,193.6h-0.2
|
||||
C149,449.6,62.3,362.9,62.3,256z"/>
|
||||
|
||||
<linearGradient id="SVGID_00000114051586691152069010000018066279775533197440_" gradientUnits="userSpaceOnUse" x1="-82.3011" y1="302.3118" x2="-227.8678" y2="309.6333" gradientTransform="matrix(0 -2.8585 -2.8596 0 1056.8274 -191.2496)">
|
||||
<stop offset="0" style="stop-color:#FFA56A;stop-opacity:0.286"/>
|
||||
<stop offset="1" style="stop-color:#474747;stop-opacity:2.600000e-02"/>
|
||||
</linearGradient>
|
||||
<path style="fill:url(#SVGID_00000114051586691152069010000018066279775533197440_);" d="M255.8,62.4
|
||||
C149.1,62.2,62.4,148.5,62.2,255.1c0,0.2,0,0.3,0,0.5v0.8c0,93.8,67.4,174,159.7,190.2l88.8-376.4C293,65,274.5,62.4,256,62.4
|
||||
L255.8,62.4z"/>
|
||||
|
||||
<linearGradient id="SVGID_00000047036973204397429830000010588397618520006025_" gradientUnits="userSpaceOnUse" x1="13.9722" y1="279.9639" x2="55.8692" y2="281.2234" gradientTransform="matrix(3.8615 0 0 -3.8615 139.3223 1336.7579)">
|
||||
<stop offset="0" style="stop-color:#573A3D;stop-opacity:0"/>
|
||||
<stop offset="1" style="stop-color:#000000;stop-opacity:0.314"/>
|
||||
</linearGradient>
|
||||
<path style="fill:url(#SVGID_00000047036973204397429830000010588397618520006025_);" d="M181.6,122.7c-1.2,0-2,0.2-2.7,0.3
|
||||
c-13.6,1.4-24,12.8-24.2,26.6V160c0,0,0,0,0,0.1c0.1,9.7,5.5,18.6,14,23.3L298,254.4l-129,74h0.2c-0.2,0-0.4,0.1-0.6,0.2
|
||||
c-8.5,4.7-13.7,13.7-13.8,23.4v11c0.2,20,23,32.8,40.3,22.8l150.8-87.2l0,0c0,0,0.1,0,0.1,0c8.3-4.8,13.3-13.8,13.2-23.4v-41.2
|
||||
c0-9.7-5.3-18.6-13.7-23.4h0c-50.3-28.1-150.7-84.4-150.7-84.4c0,0,0,0,0,0c-1.9-1-3.9-1.7-6-2
|
||||
C186.5,123.3,184.1,122.8,181.6,122.7L181.6,122.7z"/>
|
||||
|
||||
<linearGradient id="SVGID_00000053507999202757596440000012548397349556613294_" gradientUnits="userSpaceOnUse" x1="13.4723" y1="248.0875" x2="35.2938" y2="304.0133" gradientTransform="matrix(3.8615 0 0 -3.8615 139.1333 1336.7579)">
|
||||
<stop offset="0" style="stop-color:#F87191"/>
|
||||
<stop offset="1" style="stop-color:#FFDB80"/>
|
||||
</linearGradient>
|
||||
<path style="fill:url(#SVGID_00000053507999202757596440000012548397349556613294_);" d="M180.7,124.5c-1,0-1.7,0.1-2.4,0.3
|
||||
c-12.8,1.3-22.6,12-22.7,24.8V160c0.1,9.1,5.1,17.4,13.1,21.8L299.9,254v0.8l-131.4,75.3h0c-7.9,4.4-12.9,12.8-12.9,21.9v11
|
||||
c0.2,18.7,21.6,30.7,37.7,21.3L344,297h0.1c7.7-4.5,12.5-12.9,12.4-21.9v-41.4c-0.1-9-5-17.3-12.9-21.8l-150.7-84.3
|
||||
c-1.8-1-3.8-1.7-5.8-1.9C185,124.9,182.9,124.5,180.7,124.5L180.7,124.5z"/>
|
||||
|
||||
<linearGradient id="SVGID_00000023988373648259506590000012846403944250575499_" gradientUnits="userSpaceOnUse" x1="13.4524" y1="298.9084" x2="50.9769" y2="293.5988" gradientTransform="matrix(3.8615 0 0 -3.8615 139.1333 1336.7542)">
|
||||
<stop offset="0" style="stop-color:#FFCD91"/>
|
||||
<stop offset="1" style="stop-color:#FC7778"/>
|
||||
</linearGradient>
|
||||
<path style="fill:url(#SVGID_00000023988373648259506590000012846403944250575499_);" d="M180.7,124.5c-1,0-1.7,0.1-2.4,0.3
|
||||
c-12.8,1.3-22.6,12-22.7,24.8v10.3c0.1,9.2,5.1,17.6,13.1,22L299.9,254v0.6l20.3-11.3c44.2-23.1,21.4-32.3-13-51.5
|
||||
c-50.2-28.1-114.4-64.1-114.4-64.1c-1.8-1-3.8-1.6-5.8-1.9C185,124.9,182.9,124.5,180.7,124.5L180.7,124.5z"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><linearGradient id="a" x1="-78.147" x2="-177.352" y1="344.582" y2="257.717" gradientTransform="matrix(0 -3.7796 -3.7796 0 1396.529 -224.2)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#ff8aa1"/><stop offset="1" style="stop-color:#ffd850"/></linearGradient><path d="M0 256C0 114.6 114.6 0 256 0s256 114.6 256 256-114.6 256-256 256S0 397.4 0 256" style="fill:url(#a)"/><linearGradient id="b" x1="-83.916" x2="-196.049" y1="335.33" y2="249.14" gradientTransform="matrix(0 -3.3069 -3.3083 0 1222.498 -207.29)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#f9f9f9"/><stop offset="1" style="stop-color:#fff;stop-opacity:.973"/></linearGradient><path d="M31.9 256c0-123.7 100.3-224 224-224h.2c123.7 0 224 100.3 224 224s-100.3 224-224 224h-.2c-123.7 0-224-100.3-224-224" style="fill:url(#b)"/><linearGradient id="c" x1="-106.987" x2="-203.494" y1="323.445" y2="238.827" gradientTransform="matrix(0 -2.8585 -2.8596 0 1056.854 -191.25)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#857679"/><stop offset="1" style="stop-color:#110c0c"/></linearGradient><path d="M62.3 256c0-106.9 86.7-193.6 193.6-193.6h.2c106.9 0 193.6 86.7 193.6 193.6S363 449.6 256.1 449.6h-.2C149 449.6 62.3 362.9 62.3 256" style="fill:url(#c)"/><linearGradient id="d" x1="-82.301" x2="-227.868" y1="302.312" y2="309.633" gradientTransform="matrix(0 -2.8585 -2.8596 0 1056.827 -191.25)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#ffa56a;stop-opacity:.286"/><stop offset="1" style="stop-color:#474747;stop-opacity:2.600000e-02"/></linearGradient><path d="M255.8 62.4c-106.7-.2-193.4 86.1-193.6 192.7v1.3c0 93.8 67.4 174 159.7 190.2l88.8-376.4C293 65 274.5 62.4 256 62.4z" style="fill:url(#d)"/><linearGradient id="e" x1="13.972" x2="55.869" y1="279.964" y2="281.223" gradientTransform="matrix(3.8615 0 0 -3.8615 139.322 1336.758)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#573a3d;stop-opacity:0"/><stop offset="1" style="stop-color:#000;stop-opacity:.314"/></linearGradient><path d="M181.6 122.7c-1.2 0-2 .2-2.7.3-13.6 1.4-24 12.8-24.2 26.6v10.5c.1 9.7 5.5 18.6 14 23.3l129.3 71-129 74h.2c-.2 0-.4.1-.6.2-8.5 4.7-13.7 13.7-13.8 23.4v11c.2 20 23 32.8 40.3 22.8l150.8-87.2h.1c8.3-4.8 13.3-13.8 13.2-23.4V234c0-9.7-5.3-18.6-13.7-23.4-50.3-28.1-150.7-84.4-150.7-84.4-1.9-1-3.9-1.7-6-2q-3.45-1.35-7.2-1.5" style="fill:url(#e)"/><linearGradient id="f" x1="13.472" x2="35.294" y1="248.088" y2="304.013" gradientTransform="matrix(3.8615 0 0 -3.8615 139.133 1336.758)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#f87191"/><stop offset="1" style="stop-color:#ffdb80"/></linearGradient><path d="M180.7 124.5c-1 0-1.7.1-2.4.3-12.8 1.3-22.6 12-22.7 24.8V160c.1 9.1 5.1 17.4 13.1 21.8L299.9 254v.8l-131.4 75.3c-7.9 4.4-12.9 12.8-12.9 21.9v11c.2 18.7 21.6 30.7 37.7 21.3L344 297h.1c7.7-4.5 12.5-12.9 12.4-21.9v-41.4c-.1-9-5-17.3-12.9-21.8l-150.7-84.3c-1.8-1-3.8-1.7-5.8-1.9-2.1-.8-4.2-1.2-6.4-1.2" style="fill:url(#f)"/><linearGradient id="g" x1="13.452" x2="50.977" y1="298.908" y2="293.599" gradientTransform="matrix(3.8615 0 0 -3.8615 139.133 1336.754)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#ffcd91"/><stop offset="1" style="stop-color:#fc7778"/></linearGradient><path d="M180.7 124.5c-1 0-1.7.1-2.4.3-12.8 1.3-22.6 12-22.7 24.8v10.3c.1 9.2 5.1 17.6 13.1 22L299.9 254v.6l20.3-11.3c44.2-23.1 21.4-32.3-13-51.5-50.2-28.1-114.4-64.1-114.4-64.1-1.8-1-3.8-1.6-5.8-1.9-2-.9-4.1-1.3-6.3-1.3" style="fill:url(#g)"/></svg>
|
||||
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 3.5 KiB |
Reference in New Issue
Block a user