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,55 +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:serif="http://www.serif.com/"
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_00000105421326092082484040000017816068302510484872_);}
.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#D03143;}
.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
</style>
<g>
<defs>
<path id="SVGID_1_" d="M256,512L256,512C114.6,512,0,397.4,0,256v0C0,114.6,114.6,0,256,0h0c141.4,0,256,114.6,256,256v0
C512,397.4,397.4,512,256,512z"/>
</defs>
<clipPath id="SVGID_00000088101075290921535060000014535131967131708332_">
<use xlink:href="#SVGID_1_" style="overflow:visible;"/>
</clipPath>
<g style="clip-path:url(#SVGID_00000088101075290921535060000014535131967131708332_);">
<g>
<g transform="matrix(0.995504,0,0,1.00012,0.108186,-0.909355)">
<rect x="-0.1" y="0.9" class="st1" width="514.3" height="511.9"/>
</g>
<g transform="matrix(0.360329,0,0,0.360329,-46.0848,-62.082)">
<g transform="matrix(-1.50138,0.0825995,0.0825995,1.50138,2334.39,-328.504)">
<path class="st2" d="M873.8,795c-6.2,27.5-25.5,61.7-1.6,115.5c1.9,4.2,5.9,7,10.5,7.4s9-1.8,11.5-5.7c2.6-4.2,5.2-7.2,7.3-9.3
c0.9-0.9,2.3-1.1,3.5-0.6c1.2,0.6,1.9,1.8,1.8,3.1c-1.8,21.1,3.1,36.9,8.7,52.5c1.5,4.2,5.3,7.3,9.7,7.9
c4.5,0.6,8.9-1.4,11.4-5.1c1.7-2.5,3-3.3,3.8-3.6c0.2,0,0.3,0,0.5,0.1c0.1,0.1,0.2,0.2,0.2,0.4c6.3,52.9,77.7,71.8,105.5,102.1
c2.6,2.9,6.3,4.4,10.2,4.1c3.8-0.3,7.3-2.3,9.4-5.5c17.6-26.7,54-40.9,70-90.6c0.2-0.7,0.9-1.2,1.7-1.2c0.8,0,1.4,0.6,1.6,1.3
l0,0c0.9,3.9,4.1,6.8,8.1,7.5c4,0.6,7.9-1.2,10-4.6c25-41,39.1-44.8,40.2-111.7c0-0.8,0.5-1.4,1.3-1.6c0.7-0.2,1.5,0.2,1.9,0.8
c2.3,4.2,7.2,6.5,11.9,5.5c4.7-0.9,8.3-4.9,8.9-9.7c3.4-30.7-4.9-53.3-11.7-76.8c-10.9,2.8-24.1,5.5-35.7,7.1
c-5,64.4-61.2,113.5-128.2,114.6c-57.3,0.9-118-40.2-127.7-111C906.9,788.3,886.2,790.8,873.8,795z"/>
</g>
<g transform="matrix(-1.4933,0.176178,0.176178,1.4933,2231.68,-363.364)">
<path class="st2" d="M764.9,795.2c-5.8,3.4-13.1,2.6-18-2s-6.2-11.9-3.1-17.9c21.7-42.8,70.6-92.6,151.1-114.4
c-9.2,0.9-19.1,2.3-26.1,1.1c-2.3-0.4-4.6-0.7-6-2.7c-1.4-1.9-1.6-4.4-0.5-6.5c18.3-40.2,31.7-120.5,27.4-181.9
c-5.2,15.2-9.5,30.1-11.2,36.3c-0.5,2-1.8,3.7-3.5,4.8c-7.1,4.3-27.4,15.3-52.9,14.8c-6.7-0.1-12.6-4.6-14.4-11.1
c-1.8-6.5,0.9-13.4,6.6-17c26.1-16.1,46.8-45.8,78-75.3c44.9-42.4,112.6,2.5,218.3,175c1.9,3.1,1.1,7.1-1.7,9.3
c-32,24-93.7,35.4-127.7,42.5c-0.2,0-0.1,0.3-0.1,0.4c0.1,0.1,0.2,0.1,0.4,0.1c28.9-1.8,91.9-4.4,133.1-25.4
c6.1-3.1,13-4,19.6-2.5c34.3,7.4,79.5,13.7,142,7.6c6.3-0.6,12.2,2.7,15,8.3s1.9,12.4-2.4,17c-69.6,76.4-157.6,83-281.2,83.2
C897.2,739.2,817.1,765,764.9,795.2z"/>
</g>
</g>
<g transform="matrix(1.31398,0,0,1,-93.4438,-24.9074)">
<path class="st2" d="M265.2,344.1c7.4,0,14.5-3.7,19.8-0.3c6.8,4.3,7.5,4.7,11.5,2.9c9.4-4-13.7,24-30.6,24s-42.7-25-33.3-21.1
c5.9,2.4,6.8-1.3,14-5.7C251.8,340.9,258.1,344.1,265.2,344.1z"/>
</g>
<g transform="matrix(1.05697,0,0,1.05697,-15.926,-41.4857)">
<path class="st1" d="M231.8,360.2c5.5,0,12.9-4.4,23.9-4.4c11,0,17.2,4.4,21.5,4.4c-0.9,0.9-6.7,14.1-21.5,14.1
C240.9,374.3,232.7,361.3,231.8,360.2z"/>
</g>
</g>
</g>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 512 512"><style>.st1,.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#d03143}.st2{fill:#fff}</style><defs><path id="SVGID_1_" d="M256 512C114.6 512 0 397.4 0 256S114.6 0 256 0s256 114.6 256 256-114.6 256-256 256"/></defs><clipPath id="SVGID_00000088101075290921535060000014535131967131708332_"><use xlink:href="#SVGID_1_" style="overflow:visible"/></clipPath><g style="clip-path:url(#SVGID_00000088101075290921535060000014535131967131708332_)"><path d="M.009-.01h511.987v511.962H.01z" class="st1"/><path d="M346.007 275.643c4.173 14.693 15.632 32.62 4.304 62.437-.903 2.329-2.984 3.962-5.46 4.316s-4.923-.706-6.392-2.742c-1.531-2.194-3.027-3.74-4.226-4.814-.513-.46-1.277-.526-1.91-.22-.632.36-.975 1.03-.882 1.73 1.601 11.362-.58 20.055-3.144 28.662-.687 2.316-2.65 4.107-5.013 4.562a6.42 6.42 0 0 1-6.319-2.42c-.994-1.302-1.721-1.696-2.163-1.834-.108.006-.162.009-.267.069-.052.057-.103.114-.097.222-1.834 28.806-39.898 41.156-54.035 58.375a6.67 6.67 0 0 1-5.397 2.522c-2.064-.05-4.017-1.027-5.249-2.696-10.316-13.92-30.43-20.519-40.565-46.93-.13-.373-.523-.622-.956-.599s-.74.367-.827.751c-.37 2.137-2.015 3.801-4.159 4.299-2.146.443-4.31-.414-5.546-2.191-14.745-21.437-22.486-23.073-25.073-59.232-.024-.433-.312-.743-.75-.827-.385-.088-.806.153-1.005.49-1.119 2.34-3.701 3.73-6.274 3.329-2.57-.347-4.636-2.404-5.103-4.983-2.753-16.507 1.064-28.98 4.044-41.896 5.98 1.19 13.201 2.258 19.524 2.778 4.622 34.691 36.487 59.581 72.766 58.182 31.026-1.218 62.64-25.26 65.78-63.85 6.288-.13 17.561.607 24.394 2.51" class="st2"/><path d="M396.958 283.425c3.337 1.462 7.214.568 9.559-2.218s2.58-6.797.531-9.829c-14.393-21.652-43.866-45.344-88.566-51.964 5.008-.1 10.424.025 14.114-1.065 1.212-.361 2.43-.669 3.057-1.834a3.32 3.32 0 0 0-.143-3.529c-12.4-20.469-24.707-62.826-26.291-96.137a364 364 0 0 1 8.33 18.821c.397 1.045 1.204 1.877 2.189 2.36 4.093 1.864 15.714 6.494 29.404 4.606 3.598-.479 6.487-3.275 7.043-6.887s-1.335-7.153-4.63-8.728c-15.066-7.006-28.09-21.673-46.75-35.566-26.852-19.964-60.43 8.493-106.354 108.022-.826 1.789-.141 3.89 1.505 4.896 18.742 10.883 52.665 13.1 71.41 14.762.108-.013.074.155.08.209-.047.06-.101.067-.209.08-15.665.865-49.729 3.466-73.23-5.219-3.48-1.28-7.25-1.327-10.706-.1-17.986 6.159-41.907 12.418-75.924 13.103-3.428.077-6.394 2.228-7.545 5.419s-.235 6.792 2.37 8.995c42.301 36.69 90.071 34.655 156.59 26.917 59.423-6.847 104.161 1.95 134.166 14.886M255.024 319.193c9.723 0 19.052-3.7 26.016-.3 8.936 4.3 9.855 4.7 15.111 2.9 12.352-4-18.001 24-40.208 24s-56.106-25-43.755-21.1c7.752 2.4 8.935-1.3 18.396-5.7 6.832-3 15.11.2 24.44.2" class="st2"/><path d="M229.08 339.235c5.813 0 13.635-4.65 25.261-4.65 11.627 0 18.18 4.65 22.725 4.65-.951.951-7.082 14.903-22.725 14.903s-24.31-13.74-25.261-14.903" class="st1"/></g></svg>

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB