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,18 +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:v="https://vecta.io/nano"
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:#23A8E0;}
</style>
<path class="st0" d="M334.5,78c-18.4,5.4-35.5,15.6-51.7,30.6l-5.4,5l1.7,6c6.6,22.9,5.4,47.3-6.3,129.8c-3.2,23-4,25.9-9,33.8
c-40.5,64.6-110.2,111.1-150.4,100.6C73.6,373.3,62.7,326.3,86.6,268c16.7-40.7,47.7-64,65.3-49c10.3,8.8,5.6,34.3-11.7,64.5l-1.7,3
l2.7,2.9c8.8,9.5,26.8,9.9,43.7,0.9c45.5-24.3,32.6-96.1-20.1-111.4C110.7,163.2,51.1,197,18.7,261.8
c-21.3,42.7-24.8,96.8-8.3,129.6c29.1,57.9,118.2,59,192.5,2.4c7.6-5.8,13-10.5,35.8-30.8c14.9-13.4,13.6-14.1,12.1,6
c-2.8,39,2.9,55.7,20.9,61.7c14,4.6,36.4,0.7,44.7-7.8l2-2.1l5.9-33.3c10.5-58.8,12.1-66.5,20.4-99.8c6.2-24.9,5.9-24.3,13.8-29.3
c30.2-19.1,59.8-15.2,62.5,8.2c1,8.4-2.1,29.2-7.4,50.2l-8.8,34.6c-8.5,33.7-8.4,46.6,0.7,63.7c11.5,21.7,45.1,24,77,5.3
c12.2-7.2,17.6-14.6,23.6-32.4c7.2-21.5,8.1-38.8,1.8-34.5c-7.5,5.2-18.9,7.3-24.4,4.5c-5-2.5-6.2-6.9-4.7-16.4
c2.2-13.7,3.7-18.4,18.9-58.7c16.1-42.7,17.7-56.8,8.7-76c-9-19.2-23.2-28-47-29.2c-39.9-2-79.7,12.5-95,34.4
c-2,2.9-3.8,5.3-3.8,5.2c-0.1-0.1,2.4-9.3,5.6-20.4c19.2-68.6,21.8-85.7,15.1-100C373.9,81.6,352,72.8,334.5,78"/>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><path d="M334.5 78c-18.4 5.4-35.5 15.6-51.7 30.6l-5.4 5 1.7 6c6.6 22.9 5.4 47.3-6.3 129.8-3.2 23-4 25.9-9 33.8-40.5 64.6-110.2 111.1-150.4 100.6-39.8-10.5-50.7-57.5-26.8-115.8 16.7-40.7 47.7-64 65.3-49 10.3 8.8 5.6 34.3-11.7 64.5l-1.7 3 2.7 2.9c8.8 9.5 26.8 9.9 43.7.9 45.5-24.3 32.6-96.1-20.1-111.4-54.1-15.7-113.7 18.1-146.1 82.9-21.3 42.7-24.8 96.8-8.3 129.6 29.1 57.9 118.2 59 192.5 2.4 7.6-5.8 13-10.5 35.8-30.8 14.9-13.4 13.6-14.1 12.1 6-2.8 39 2.9 55.7 20.9 61.7 14 4.6 36.4.7 44.7-7.8l2-2.1 5.9-33.3c10.5-58.8 12.1-66.5 20.4-99.8 6.2-24.9 5.9-24.3 13.8-29.3 30.2-19.1 59.8-15.2 62.5 8.2 1 8.4-2.1 29.2-7.4 50.2l-8.8 34.6c-8.5 33.7-8.4 46.6.7 63.7 11.5 21.7 45.1 24 77 5.3 12.2-7.2 17.6-14.6 23.6-32.4 7.2-21.5 8.1-38.8 1.8-34.5-7.5 5.2-18.9 7.3-24.4 4.5-5-2.5-6.2-6.9-4.7-16.4 2.2-13.7 3.7-18.4 18.9-58.7 16.1-42.7 17.7-56.8 8.7-76s-23.2-28-47-29.2c-39.9-2-79.7 12.5-95 34.4-2 2.9-3.8 5.3-3.8 5.2-.1-.1 2.4-9.3 5.6-20.4 19.2-68.6 21.8-85.7 15.1-100-7.4-15.3-29.3-24.1-46.8-18.9" style="fill-rule:evenodd;clip-rule:evenodd;fill:#23a8e0"/></svg>

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB