fix: resolve merge conflicts
This commit is contained in:
Dashboard Icons Bot
committed by
Bjorn Lammers
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
+1
-96
@@ -1,96 +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="svg77" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.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:#2D2B70;}
|
||||
.st1{fill:url(#path54_00000168111188314492524150000015208028078693843842_);}
|
||||
.st2{fill:url(#path56_00000132791094366422896290000004222473881241590443_);}
|
||||
.st3{fill:url(#path58_00000106138380697276515740000001566043641122527923_);}
|
||||
.st4{fill:#FFFFFF;}
|
||||
.st5{fill:#231F20;}
|
||||
.st6{fill:url(#path64_00000106854586522299768000000007722921168734911911_);}
|
||||
.st7{fill:url(#path68_00000080898817305760623280000015036025510328435627_);}
|
||||
.st8{fill:url(#path70_00000115506663784320880670000010517714985159589288_);}
|
||||
</style>
|
||||
<sodipodi:namedview bordercolor="#666666" borderopacity="1" fit-margin-bottom="2" fit-margin-left="2" fit-margin-right="2" fit-margin-top="2" gridtolerance="10" guidetolerance="10" id="namedview1190" inkscape:current-layer="g912" inkscape:cx="177.52215" inkscape:cy="102.10099" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="1006" inkscape:window-maximized="1" inkscape:window-width="1918" inkscape:window-x="0" inkscape:window-y="24" inkscape:zoom="1.9394992" objecttolerance="10" pagecolor="#ffffff" showgrid="false">
|
||||
</sodipodi:namedview>
|
||||
<g id="g912" transform="matrix(0.54781,0,0,0.54781,-55.563875,2.0002941)">
|
||||
<g id="g1866">
|
||||
<path id="path46" inkscape:connector-curvature="0" class="st0" d="M973.4,697.4c0,0.2,0,0.2-0.4,0.4c0.2-0.3,0.2-0.7,0.2-1.1
|
||||
C973.3,696.9,973.4,697.1,973.4,697.4z"/>
|
||||
<path id="path48" inkscape:connector-curvature="0" class="st0" d="M973.1,696.7c0,0.4,0,0.7-0.2,1.1c0.4-0.2,0.4-0.2,0.4-0.4
|
||||
C973.4,697.1,973.3,696.9,973.1,696.7z"/>
|
||||
<path id="path50" inkscape:connector-curvature="0" class="st0" d="M973.4,697.4c0,0.2,0,0.2-0.4,0.4c0.2-0.3,0.2-0.7,0.2-1.1
|
||||
C973.3,696.9,973.4,697.1,973.4,697.4z"/>
|
||||
<path id="path52" inkscape:connector-curvature="0" class="st0" d="M973.4,697.4c0,0.2,0,0.2-0.4,0.4c0.2-0.3,0.2-0.7,0.2-1.1
|
||||
C973.3,696.9,973.4,697.1,973.4,697.4z"/>
|
||||
|
||||
<linearGradient id="path54_00000076591225294429058470000002896575903554448777_" gradientUnits="userSpaceOnUse" x1="1830.3234" y1="-497.6211" x2="1830.3234" y2="-687.5126" gradientTransform="matrix(0.5478 0 0 -0.5478 -284.3931 196.5666)">
|
||||
<stop offset="0" style="stop-color:#F58020"/>
|
||||
<stop offset="1" style="stop-color:#FDEB01"/>
|
||||
</linearGradient>
|
||||
|
||||
<path id="path54" inkscape:connector-curvature="0" style="fill:url(#path54_00000076591225294429058470000002896575903554448777_);" d="
|
||||
M867.8,571.9c-70.3,58.6-156.4,95.3-247.4,105.3c-34.1-66.1-51.8-139.3-51.6-213.7C678.1,463.4,784,501.8,867.8,571.9z"/>
|
||||
|
||||
<linearGradient id="path56_00000069367884746409567430000002568472382764728215_" gradientUnits="userSpaceOnUse" x1="1557.3771" y1="-331.6469" x2="2024.683" y2="-331.6469" gradientTransform="matrix(0.5478 0 0 -0.5478 -284.3931 196.5666)">
|
||||
<stop offset="0" style="stop-color:#FFC50D"/>
|
||||
<stop offset="1" style="stop-color:#FDEB01"/>
|
||||
</linearGradient>
|
||||
|
||||
<path id="path56" inkscape:connector-curvature="0" style="fill:url(#path56_00000069367884746409567430000002568472382764728215_);" d="
|
||||
M1019,338.3C986.2,220.5,908.5,120.2,802.5,59.1c-87.9,50.6-157,128.5-196.6,221.9c-24.6,57.7-37.2,119.8-37.1,182.5
|
||||
c166.7,0.1,320.7,89,404.4,233.2c0.2,0.2,0.3,0.4,0.2,0.7C1036.2,588.7,1052.6,459.3,1019,338.3z"/>
|
||||
|
||||
<linearGradient id="path58_00000158004497817456360770000000002385456113920419_" gradientUnits="userSpaceOnUse" x1="1344.0994" y1="321.8313" x2="1344.0994" y2="-557.5102" gradientTransform="matrix(0.5478 0 0 -0.5478 -284.3931 196.5666)">
|
||||
<stop offset="0" style="stop-color:#3FC6F1"/>
|
||||
<stop offset="1" style="stop-color:#4063AE"/>
|
||||
</linearGradient>
|
||||
|
||||
<path id="path58" inkscape:connector-curvature="0" style="fill:url(#path58_00000158004497817456360770000000002385456113920419_);" d="
|
||||
M802.4,868.2c-223.4,129-509.1,52.5-638.3-170.9c-6.8-11.5-12.8-23.2-18.4-35.3c-1.7-3.7-2.8-6.1-3-6.8l-0.2-0.2
|
||||
c-23.8-52.8-37.6-109.7-40.4-167.6c-0.2-1.9-0.3-3.9-0.2-5.8v-0.2c-0.4-5.8-0.4-11.9-0.4-17.9c0-8,0.2-16,0.7-24
|
||||
c1.7-34.2,7.2-68.2,16.4-101.2C173.2,141.1,354-3.6,568.6-3.6c82.1-0.2,162.8,21.5,233.8,62.7c-87.9,50.6-157,128.5-196.6,221.9
|
||||
C513.4,498.3,597.8,750.4,802.4,868.2L802.4,868.2z"/>
|
||||
<circle id="circle60" class="st4" cx="423.6" cy="237.7" r="105.2"/>
|
||||
<path id="path62" inkscape:connector-curvature="0" class="st5" d="M423.7,172.3c-36.1-0.1-65.4,29.1-65.5,65.2
|
||||
c-0.1,36.1,29.1,65.4,65.2,65.5s65.4-29.1,65.5-65.2c0-0.1,0-0.1,0-0.2c0.1-1.7-0.1-3.4-0.3-5c-18.3,10.5-41.7,4.1-52.2-14.3
|
||||
c-3.3-5.7-5-12.2-5-18.8c0-9.1,3.3-18,9.4-24.9C435.2,173.2,429.4,172.4,423.7,172.3L423.7,172.3z"/>
|
||||
<g id="g66">
|
||||
|
||||
<linearGradient id="path64_00000168118222111748673680000006879297407760600201_" gradientUnits="userSpaceOnUse" x1="2352.5955" y1="-723.9769" x2="1952.5372" y2="-505.1079" gradientTransform="matrix(0.5478 0 0 -0.5478 -284.3931 196.5666)">
|
||||
<stop offset="0" style="stop-color:#FFFFFF"/>
|
||||
<stop offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
|
||||
</linearGradient>
|
||||
|
||||
<path id="path64" inkscape:connector-curvature="0" style="fill:url(#path64_00000168118222111748673680000006879297407760600201_);" d="
|
||||
M973.1,694.1v2.6c-83.6-144.2-237.7-233-404.4-233.2c-0.1-62.7,12.5-124.9,37.2-182.5c142.4,27.9,260.4,114.6,321.8,230.8
|
||||
C957.5,568,973.1,630.6,973.1,694.1L973.1,694.1z"/>
|
||||
</g>
|
||||
|
||||
<linearGradient id="path68_00000159449489726022343110000016655612650200783294_" gradientUnits="userSpaceOnUse" x1="736.0262" y1="-1282.783" x2="838.6006" y2="-1147.2301" gradientTransform="matrix(0.5478 0 0 -0.5478 -284.3931 196.5666)">
|
||||
<stop offset="0" style="stop-color:#3FC6F1"/>
|
||||
<stop offset="1" style="stop-color:#4063AE"/>
|
||||
</linearGradient>
|
||||
|
||||
<path id="path68" inkscape:connector-curvature="0" style="fill:url(#path68_00000159449489726022343110000016655612650200783294_);" d="
|
||||
M123.9,930.9c96.2-84.1,37-234.7,21.9-268.8c5.6,12.1,11.7,23.8,18.4,35.3c35.5,61.6,84.6,114.2,143.6,153.7
|
||||
C242.5,921.6,123.9,930.9,123.9,930.9L123.9,930.9z"/>
|
||||
<g id="g72">
|
||||
|
||||
<linearGradient id="path70_00000007422103675738432120000016882951071281223837_" gradientUnits="userSpaceOnUse" x1="2083.1951" y1="-1096.9008" x2="1459.25" y2="-911.1682" gradientTransform="matrix(0.5478 0 0 -0.5478 -284.3931 196.5666)">
|
||||
<stop offset="0" style="stop-color:#FFFFFF"/>
|
||||
<stop offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
|
||||
</linearGradient>
|
||||
|
||||
<path id="path70" inkscape:connector-curvature="0" style="fill:url(#path70_00000007422103675738432120000016882951071281223837_);" d="
|
||||
M802.5,868.2c-223.5,129-509.3,52.5-638.3-171c-37-64-58.2-135.9-62-209.7c-0.2-1.9-0.3-3.9-0.2-5.8v-0.2
|
||||
c-0.4-5.8-0.4-11.9-0.4-17.9c0-8,0.2-16,0.7-24c1.7-34.2,7.2-68.2,16.4-101.2c7.7,28.3,18.2,55.7,31.4,82
|
||||
C228.9,579.4,391.2,680,568.8,680.1c17.3,0,34.5-0.9,51.7-2.8C661.4,757.1,724.6,823.5,802.5,868.2z"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="svg77" x="0" y="0" version="1.1" viewBox="0 0 512 512"><style>.st0{fill:#2d2b70}</style><g id="g912" transform="translate(-55.564 2)scale(.54781)"><g id="g1866"><path id="path46" d="M973.4 697.4c0 .2 0 .2-.4.4.2-.3.2-.7.2-1.1.1.2.2.4.2.7" class="st0"/><path id="path48" d="M973.1 696.7c0 .4 0 .7-.2 1.1.4-.2.4-.2.4-.4.1-.3 0-.5-.2-.7" class="st0"/><path id="path50" d="M973.4 697.4c0 .2 0 .2-.4.4.2-.3.2-.7.2-1.1.1.2.2.4.2.7" class="st0"/><path id="path52" d="M973.4 697.4c0 .2 0 .2-.4.4.2-.3.2-.7.2-1.1.1.2.2.4.2.7" class="st0"/><linearGradient id="path54_00000076591225294429058470000002896575903554448777_" x1="1830.323" x2="1830.323" y1="-497.621" y2="-687.513" gradientTransform="matrix(.5478 0 0 -.5478 -284.393 196.567)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#f58020"/><stop offset="1" style="stop-color:#fdeb01"/></linearGradient><path id="path54" d="M867.8 571.9c-70.3 58.6-156.4 95.3-247.4 105.3-34.1-66.1-51.8-139.3-51.6-213.7 109.3-.1 215.2 38.3 299 108.4" style="fill:url(#path54_00000076591225294429058470000002896575903554448777_)"/><linearGradient id="path56_00000069367884746409567430000002568472382764728215_" x1="1557.377" x2="2024.683" y1="-331.647" y2="-331.647" gradientTransform="matrix(.5478 0 0 -.5478 -284.393 196.567)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#ffc50d"/><stop offset="1" style="stop-color:#fdeb01"/></linearGradient><path id="path56" d="M1019 338.3C986.2 220.5 908.5 120.2 802.5 59.1c-87.9 50.6-157 128.5-196.6 221.9-24.6 57.7-37.2 119.8-37.1 182.5 166.7.1 320.7 89 404.4 233.2.2.2.3.4.2.7 62.8-108.7 79.2-238.1 45.6-359.1" style="fill:url(#path56_00000069367884746409567430000002568472382764728215_)"/><linearGradient id="path58_00000158004497817456360770000000002385456113920419_" x1="1344.099" x2="1344.099" y1="321.831" y2="-557.51" gradientTransform="matrix(.5478 0 0 -.5478 -284.393 196.567)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#3fc6f1"/><stop offset="1" style="stop-color:#4063ae"/></linearGradient><path id="path58" d="M802.4 868.2c-223.4 129-509.1 52.5-638.3-170.9-6.8-11.5-12.8-23.2-18.4-35.3-1.7-3.7-2.8-6.1-3-6.8l-.2-.2c-23.8-52.8-37.6-109.7-40.4-167.6-.2-1.9-.3-3.9-.2-5.8v-.2c-.4-5.8-.4-11.9-.4-17.9 0-8 .2-16 .7-24 1.7-34.2 7.2-68.2 16.4-101.2C173.2 141.1 354-3.6 568.6-3.6c82.1-.2 162.8 21.5 233.8 62.7-87.9 50.6-157 128.5-196.6 221.9-92.4 217.3-8 469.4 196.6 587.2" style="fill:url(#path58_00000158004497817456360770000000002385456113920419_)"/><circle id="circle60" cx="423.6" cy="237.7" r="105.2" style="fill:#fff"/><path id="path62" d="M423.7 172.3c-36.1-.1-65.4 29.1-65.5 65.2s29.1 65.4 65.2 65.5 65.4-29.1 65.5-65.2v-.2c.1-1.7-.1-3.4-.3-5-18.3 10.5-41.7 4.1-52.2-14.3-3.3-5.7-5-12.2-5-18.8 0-9.1 3.3-18 9.4-24.9-5.6-1.4-11.4-2.2-17.1-2.3" style="fill:#231f20"/><g id="g66"><linearGradient id="path64_00000168118222111748673680000006879297407760600201_" x1="2352.595" x2="1952.537" y1="-723.977" y2="-505.108" gradientTransform="matrix(.5478 0 0 -.5478 -284.393 196.567)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#fff"/><stop offset="1" style="stop-color:#fff;stop-opacity:0"/></linearGradient><path id="path64" d="M973.1 694.1v2.6c-83.6-144.2-237.7-233-404.4-233.2-.1-62.7 12.5-124.9 37.2-182.5 142.4 27.9 260.4 114.6 321.8 230.8 29.8 56.2 45.4 118.8 45.4 182.3" style="fill:url(#path64_00000168118222111748673680000006879297407760600201_)"/></g><linearGradient id="path68_00000159449489726022343110000016655612650200783294_" x1="736.026" x2="838.601" y1="-1282.783" y2="-1147.23" gradientTransform="matrix(.5478 0 0 -.5478 -284.393 196.567)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#3fc6f1"/><stop offset="1" style="stop-color:#4063ae"/></linearGradient><path id="path68" d="M123.9 930.9c96.2-84.1 37-234.7 21.9-268.8 5.6 12.1 11.7 23.8 18.4 35.3 35.5 61.6 84.6 114.2 143.6 153.7-65.3 70.5-183.9 79.8-183.9 79.8" style="fill:url(#path68_00000159449489726022343110000016655612650200783294_)"/><g id="g72"><linearGradient id="path70_00000007422103675738432120000016882951071281223837_" x1="2083.195" x2="1459.25" y1="-1096.901" y2="-911.168" gradientTransform="matrix(.5478 0 0 -.5478 -284.393 196.567)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#fff"/><stop offset="1" style="stop-color:#fff;stop-opacity:0"/></linearGradient><path id="path70" d="M802.5 868.2c-223.5 129-509.3 52.5-638.3-171-37-64-58.2-135.9-62-209.7-.2-1.9-.3-3.9-.2-5.8v-.2c-.4-5.8-.4-11.9-.4-17.9 0-8 .2-16 .7-24 1.7-34.2 7.2-68.2 16.4-101.2 7.7 28.3 18.2 55.7 31.4 82 78.8 159 241.1 259.6 418.7 259.7 17.3 0 34.5-.9 51.7-2.8 40.9 79.8 104.1 146.2 182 190.9" style="fill:url(#path70_00000007422103675738432120000016882951071281223837_)"/></g></g></g></svg>
|
||||
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 4.7 KiB |
Reference in New Issue
Block a user