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,59 +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{clip-path:url(#SVGID_00000031919711394565265580000011537520005378765975_);}
.st1{clip-path:url(#SVGID_00000133508331914076908680000000219716459287753404_);fill:url(#rect3820_00000168087111106519629590000008699577362158259364_);}
.st2{fill:#FFFFFF;}
</style>
<g>
<defs>
<path id="SVGID_1_" d="M395.3,512h-279C52.1,512,0,459.9,0,395.7v-279C0,52.5,52.1,0.4,116.3,0.4h279
c64.2,0,116.3,52.1,116.3,116.3v279C511.6,459.9,459.5,512,395.3,512z"/>
</defs>
<clipPath id="SVGID_00000072248428156352929520000017854277328914370236_">
<use xlink:href="#SVGID_1_" style="overflow:visible;"/>
</clipPath>
<g id="g3846" transform="translate(50.62 -1.98)scale(3.41047)" style="clip-path:url(#SVGID_00000072248428156352929520000017854277328914370236_);">
<g>
<defs>
<rect id="SVGID_00000177484911204897655790000004743957930130943646_" x="-195.6" y="-180.1" width="511.6" height="511.6"/>
</defs>
<clipPath id="SVGID_00000098185303085096001410000002115121450862911630_">
<use xlink:href="#SVGID_00000177484911204897655790000004743957930130943646_" style="overflow:visible;"/>
</clipPath>
<linearGradient id="rect3820_00000125604078068714220270000006421331298964375464_" gradientUnits="userSpaceOnUse" x1="-7.3582" y1="135.9098" x2="-7.3582" y2="285.9098" gradientTransform="matrix(3.4105 0 0 -3.4105 85.2525 614.2231)">
<stop offset="0" style="stop-color:#007C8F"/>
<stop offset="0.371" style="stop-color:#007088"/>
<stop offset="1" style="stop-color:#005377"/>
</linearGradient>
<path id="rect3820" style="clip-path:url(#SVGID_00000098185303085096001410000002115121450862911630_);fill:url(#rect3820_00000125604078068714220270000006421331298964375464_);" d="
M-14.8,0.7h150v150h-150V0.7z"/>
</g>
<g>
<path id="path3840" class="st2" d="M105.5,93.1c0.8-1.1,1.4-2.4,1.9-3.5c0.2-0.2,0.2-0.3,0.2-0.6c0-0.2,0.2-0.3,0-0.3
c0-0.2-1.3-0.2-1.8,0.2c-0.3,0.3-1.8,4.3-6.2,8.3c-2.6,2.2-5.3,3-7.8,2.7c-1.9-0.2-3.4-1.4-4.2-3.5c-0.8-2.2-1-4.8-0.3-8.2
c1.3-6.1,2.9-9.1,5-9.1c1.3,0,1.4,2.2,0.2,6.9c-1,3.2-2.4,5.4-4,6.6c-0.6,0.3-0.8,0.6-0.8,0.8c0,0.3,0.5,0.3,1.3,0
c3-0.8,5.8-1.9,8.2-3.4c2.4-1.6,4-3.2,4.5-4.8c0.5-1.9-0.2-3.5-1.8-4.8c-1.6-1.3-3.8-2.1-6.4-2.2s-5.1,0.3-7.5,1.4
c0-0.2,0.2-0.2,0.2-0.3c4-6.2,6.9-12,8.5-17.8c1.8-5.6,1.3-9.8-1.4-12.3c-1-0.8-2.4-1.4-4.3-1.9c-3.7-1-7.7-2.2-4.6,1.9
c0.5,0.8,0.8,1.6,1,2.4c0.6,2.9,0.5,6.6-0.6,11c-1.1,4.5-2.9,9.3-5.1,14.1c-2.2,4.8-4.6,9.3-7.4,13.1c-2.7,3.8-5.3,6.6-7.8,8
c-0.2-0.3-0.2-0.6-0.2-1v-2.4c0-0.8,0.2-1.4,0.2-1.9c0.6-3.8,1.3-8,2.2-12.3c1-4.3,1.8-8.2,2.6-11.7c0.6-2.2,1-3.8,1.1-5
s0-1.9-0.3-2.4c-0.3-0.5-1.3-1.1-2.6-1.8c-0.8-0.5-1.8-1-3-1.6c-2.4-1.4-2.6-1.4-3.4,1.1c-0.6,2.2-1.9,5.4-3.7,9.8
c-1.6,4.3-3.5,8.6-5.6,13.3c-2.1,4.6-4,8.5-5.9,11.5c-1.9,3.2-3.4,4.8-4.6,4.8c-0.3,0-0.5-0.2-0.5-0.5s-0.2-0.6-0.2-1.1
c0-0.8,0.2-1.6,0.2-2.4c0.2-0.8,0.3-1.4,0.3-1.9c0.5-2.6,1.3-5.6,2.1-9.1c1-3.5,1.9-7,2.7-10.4c1-3.4,1.8-6.2,2.4-8.6
c1-3,1.6-5,1.8-6.1c0.2-1-0.5-1.9-1.6-2.6c-1-0.5-2.6-1.4-4.6-2.7c-1.6-1-2.2-0.8-3.8-0.3c-4,1.4-7.8,3-12,5
c-4.8,2.2-9,4.6-12.5,6.9c-3.5,2.4-5.8,4.5-6.7,6.4c-1.1,2.4-1,4.8,0.3,7c0.8,1.3,1.8,2.4,3,3.4c4.8,3.4,3.2,1.4,3.7-2.4
c0.2-1.4,0.6-2.7,1.3-3.8c1.6-2.7,4.5-5.8,9-9.3c4.3-3.4,9.1-6.2,14.4-8.3c-1,3.5-1.9,7.4-3,11.5c-1.1,4.2-2.1,8.2-3,12
s-1.6,7-2.1,9.6c-0.3,1.3-0.3,2.4-0.3,3.5s0.5,2.2,1.1,3.4c0.8,1.1,1.8,1.9,2.9,2.6c1.1,0.6,2.2,1,3.5,1c2.6-0.2,5-1.8,7.2-5
c2.4-3.2,4.5-7,6.4-11.5s3.7-9,5.1-13.4c-0.8,3.5-1.4,7-1.9,10.4c-0.6,3.4-1,6.4-1.3,9c-0.2,1.3-0.2,2.4-0.2,3.5
c0.2,1.1,0.6,2.2,1.4,3.4s1.8,1.9,3,2.6c1.1,0.6,2.4,1,3.7,1.1c2.4,0,5.8-2.2,10.1-6.6c1-1.1,2.1-2.2,3-3.4
c-0.2,3,0.8,5.4,3.2,7.2c2.7,2.1,5.9,3.2,9.8,3.4c3.8,0.2,7.5-1.1,10.6-3.4C102.3,97.1,104.1,95.2,105.5,93.1"/>
</g>
</g>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" viewBox="0 0 512 512"><defs><path id="a" d="M395.3 512h-279C52.1 512 0 459.9 0 395.7v-279C0 52.5 52.1.4 116.3.4h279c64.2 0 116.3 52.1 116.3 116.3v279c0 64.2-52.1 116.3-116.3 116.3"/></defs><clipPath id="b"><use xlink:href="#a" style="overflow:visible"/></clipPath><g style="clip-path:url(#b)" transform="translate(50.62 -1.98)scale(3.41047)"><defs><path id="c" d="M-195.6-180.1H316v511.6h-511.6z"/></defs><clipPath id="d"><use xlink:href="#c" style="overflow:visible"/></clipPath><linearGradient id="e" x1="-7.358" x2="-7.358" y1="135.91" y2="285.91" gradientTransform="matrix(3.4105 0 0 -3.4105 85.252 614.223)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#007c8f"/><stop offset=".371" style="stop-color:#007088"/><stop offset="1" style="stop-color:#005377"/></linearGradient><path d="M-14.8.7h150v150h-150z" style="clip-path:url(#d);fill:url(#e)"/><path d="M105.5 93.1c.8-1.1 1.4-2.4 1.9-3.5.2-.2.2-.3.2-.6 0-.2.2-.3 0-.3 0-.2-1.3-.2-1.8.2-.3.3-1.8 4.3-6.2 8.3-2.6 2.2-5.3 3-7.8 2.7-1.9-.2-3.4-1.4-4.2-3.5-.8-2.2-1-4.8-.3-8.2 1.3-6.1 2.9-9.1 5-9.1 1.3 0 1.4 2.2.2 6.9-1 3.2-2.4 5.4-4 6.6-.6.3-.8.6-.8.8 0 .3.5.3 1.3 0 3-.8 5.8-1.9 8.2-3.4 2.4-1.6 4-3.2 4.5-4.8.5-1.9-.2-3.5-1.8-4.8s-3.8-2.1-6.4-2.2-5.1.3-7.5 1.4c0-.2.2-.2.2-.3 4-6.2 6.9-12 8.5-17.8 1.8-5.6 1.3-9.8-1.4-12.3-1-.8-2.4-1.4-4.3-1.9-3.7-1-7.7-2.2-4.6 1.9.5.8.8 1.6 1 2.4.6 2.9.5 6.6-.6 11-1.1 4.5-2.9 9.3-5.1 14.1s-4.6 9.3-7.4 13.1c-2.7 3.8-5.3 6.6-7.8 8-.2-.3-.2-.6-.2-1v-2.4c0-.8.2-1.4.2-1.9.6-3.8 1.3-8 2.2-12.3 1-4.3 1.8-8.2 2.6-11.7.6-2.2 1-3.8 1.1-5s0-1.9-.3-2.4-1.3-1.1-2.6-1.8c-.8-.5-1.8-1-3-1.6-2.4-1.4-2.6-1.4-3.4 1.1-.6 2.2-1.9 5.4-3.7 9.8-1.6 4.3-3.5 8.6-5.6 13.3-2.1 4.6-4 8.5-5.9 11.5-1.9 3.2-3.4 4.8-4.6 4.8-.3 0-.5-.2-.5-.5s-.2-.6-.2-1.1c0-.8.2-1.6.2-2.4.2-.8.3-1.4.3-1.9.5-2.6 1.3-5.6 2.1-9.1 1-3.5 1.9-7 2.7-10.4 1-3.4 1.8-6.2 2.4-8.6 1-3 1.6-5 1.8-6.1.2-1-.5-1.9-1.6-2.6-1-.5-2.6-1.4-4.6-2.7-1.6-1-2.2-.8-3.8-.3-4 1.4-7.8 3-12 5-4.8 2.2-9 4.6-12.5 6.9-3.5 2.4-5.8 4.5-6.7 6.4-1.1 2.4-1 4.8.3 7 .8 1.3 1.8 2.4 3 3.4 4.8 3.4 3.2 1.4 3.7-2.4.2-1.4.6-2.7 1.3-3.8 1.6-2.7 4.5-5.8 9-9.3 4.3-3.4 9.1-6.2 14.4-8.3-1 3.5-1.9 7.4-3 11.5q-1.65 6.3-3 12c-1.35 5.7-1.6 7-2.1 9.6-.3 1.3-.3 2.4-.3 3.5s.5 2.2 1.1 3.4c.8 1.1 1.8 1.9 2.9 2.6 1.1.6 2.2 1 3.5 1 2.6-.2 5-1.8 7.2-5 2.4-3.2 4.5-7 6.4-11.5s3.7-9 5.1-13.4c-.8 3.5-1.4 7-1.9 10.4-.6 3.4-1 6.4-1.3 9-.2 1.3-.2 2.4-.2 3.5.2 1.1.6 2.2 1.4 3.4s1.8 1.9 3 2.6c1.1.6 2.4 1 3.7 1.1 2.4 0 5.8-2.2 10.1-6.6 1-1.1 2.1-2.2 3-3.4-.2 3 .8 5.4 3.2 7.2 2.7 2.1 5.9 3.2 9.8 3.4 3.8.2 7.5-1.1 10.6-3.4 2.5-1.2 4.3-3.1 5.7-5.2" style="fill:#fff"/></g></svg>

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB