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
+1 -40
View File
@@ -1,40 +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-rule:evenodd;clip-rule:evenodd;fill:#14AE5C;}
</style>
<g>
<path class="st0" d="M71.2,53.9c16.1,0.3,32,3.5,47.2,9.2c15.2,5.6,29.8,12.5,43.8,20.8c13.9,8.2,27.3,17.2,40,27.2
c4.2,3.3,8.3,6.6,12.4,10c3.5-3.6,7-7.2,10.6-10.7c5.2-5,10.6-9.9,16-14.6c2.8-2.3,5.5-4.7,8.3-7l4.2-3.4l4.3-3.3
c11.3-8.9,23-17.1,35.1-24.7c12.1-7.7,24.5-14.5,37.2-20.9c25.4-12.7,52.1-22.3,79.5-28.8c13.7-3.2,27.6-5.4,41.6-6.7
c14-1.3,28.1-1.4,42.1-0.1c-4,2.9-8,5.5-12,8l0,0c-1.9,1.2-3.8,2.5-5.7,3.7c-2.9,1.9-5.8,3.8-8.8,5.6l-0.3,0.2
c-1.4,0.9-2.7,1.7-4.1,2.6l-4.3,2.8c-7.4,4.7-14.6,9.4-21.9,14.1c-4.1,2.6-8.1,5.3-12.2,7.9c-22.3,14.6-44,29.3-65.2,44.5
c-21.2,15.1-41.9,30.6-62.1,46.7c-1.7,1.4-3.4,2.7-5.1,4.1l0,0l0,0c-3.3,2.7-6.7,5.3-10,8.1c-3.4,2.7-6.7,5.5-10,8.3l0,0l0,0
c-1.6,1.4-3.2,2.7-4.8,4.1c-1,0.9-2,1.8-3.1,2.6l0,0c-3.8,3.3-7.7,6.6-11.4,10c-1.3,1.2-2.6,2.3-3.8,3.4l0,0l0,0
c-1.1,1-2.2,1.9-3.2,2.9l-6.4,5.9l-26.9,24.8l-17.5-24.7c-0.3-0.5-1-1.3-1.5-1.9l-1.7-2.1l-3.4-4.3l-7-8.7
c-4.7-5.8-9.5-11.6-14.3-17.3c-9.6-11.5-19.5-22.9-29.5-34.2c-10.1-11.2-20.3-22.3-31.2-33C95.1,73.8,83.5,63.4,71.2,53.9z
M229.6,429.7c-23.9,0-47.3-6.7-67.6-19.2c-20.3-12.5-36.7-30.4-47.2-51.6l-76.4,32.6c22.7,48,62.8,85.6,112.4,105.4
c49.6,19.8,104.8,20.2,154.7,1.2l-32.8-75.7C258.8,427.2,244.3,429.7,229.6,429.7z M118,240.3c-10.8,19-16.5,40.5-16.5,62.4
c0,13.4,2.1,26.7,6.3,39.4l-76.5,32.6c-16.1-43.6-17.1-91.2-2.9-135.4s42.8-82.5,81.2-108.8l53.7,63.5
C144.4,205.3,128.8,221.2,118,240.3z M357,135.8l-71.7,52.5c24.2,11.6,44.1,30.5,56.9,53.8l76.5-32.6
C404.1,180.6,383,155.3,357,135.8z M426.1,226.2c9.7,24.4,14.7,50.3,14.6,76.5c0,39.2-11.2,77.6-32.1,110.8
c-20.9,33.2-50.9,60-86.4,77.2L289.4,415c27.5-14.4,48.7-38.1,59.8-66.9c11.1-28.7,11.3-60.5,0.6-89.4L426.1,226.2z"/>
<path class="st0" d="M71.2,53.9c16.1,0.3,32,3.5,47.2,9.2c15.2,5.6,29.8,12.5,43.8,20.8c13.9,8.2,27.3,17.2,40,27.2
c4.2,3.3,8.3,6.6,12.4,10c3.5-3.6,7-7.2,10.6-10.7c5.2-5,10.6-9.9,16-14.6c2.8-2.3,5.5-4.7,8.3-7l4.2-3.4l4.3-3.3
c11.3-8.9,23-17.1,35.1-24.7c12.1-7.7,24.5-14.5,37.2-20.9c25.4-12.7,52.1-22.3,79.5-28.8c13.7-3.2,27.6-5.4,41.6-6.7
c14-1.3,28.1-1.4,42.1-0.1c-4,2.9-8,5.5-12,8l0,0c-1.9,1.2-3.8,2.5-5.7,3.7c-2.9,1.9-5.8,3.8-8.8,5.6l-0.3,0.2
c-1.4,0.9-2.7,1.7-4.1,2.6l-4.3,2.8c-7.4,4.7-14.6,9.4-21.9,14.1c-4.1,2.6-8.1,5.3-12.2,7.9c-22.3,14.6-44,29.3-65.2,44.5
c-21.2,15.1-41.9,30.6-62.1,46.7c-1.7,1.4-3.4,2.7-5.1,4.1l0,0l0,0c-3.3,2.7-6.7,5.3-10,8.1c-3.4,2.7-6.7,5.5-10,8.3l0,0l0,0
c-1.6,1.4-3.2,2.7-4.8,4.1c-1,0.9-2,1.8-3.1,2.6l0,0c-3.8,3.3-7.7,6.6-11.4,10c-1.3,1.2-2.6,2.3-3.8,3.4l0,0l0,0
c-1.1,1-2.2,1.9-3.2,2.9l-6.4,5.9l-26.9,24.8l-17.5-24.7c-0.3-0.5-1-1.3-1.5-1.9l-1.7-2.1l-3.4-4.3l-7-8.7
c-4.7-5.8-9.5-11.6-14.3-17.3c-9.6-11.5-19.5-22.9-29.5-34.2c-10.1-11.2-20.3-22.3-31.2-33C95.1,73.8,83.5,63.4,71.2,53.9z
M229.6,429.7c-23.9,0-47.3-6.7-67.6-19.2c-20.3-12.5-36.7-30.4-47.2-51.6l-76.4,32.6c22.7,48,62.8,85.6,112.4,105.4
c49.6,19.8,104.8,20.2,154.7,1.2l-32.8-75.7C258.8,427.2,244.3,429.7,229.6,429.7z M118,240.3c-10.8,19-16.5,40.5-16.5,62.4
c0,13.4,2.1,26.7,6.3,39.4l-76.5,32.6c-16.1-43.6-17.1-91.2-2.9-135.4s42.8-82.5,81.2-108.8l53.7,63.5
C144.4,205.3,128.8,221.2,118,240.3z M357,135.8l-71.7,52.5c24.2,11.6,44.1,30.5,56.9,53.8l76.5-32.6
C404.1,180.6,383,155.3,357,135.8z M426.1,226.2c9.7,24.4,14.7,50.3,14.6,76.5c0,39.2-11.2,77.6-32.1,110.8
c-20.9,33.2-50.9,60-86.4,77.2L289.4,415c27.5-14.4,48.7-38.1,59.8-66.9c11.1-28.7,11.3-60.5,0.6-89.4L426.1,226.2z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 512 512"><style>.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#14ae5c}</style><path d="M71.2 53.9c16.1.3 32 3.5 47.2 9.2 15.2 5.6 29.8 12.5 43.8 20.8 13.9 8.2 27.3 17.2 40 27.2 4.2 3.3 8.3 6.6 12.4 10 3.5-3.6 7-7.2 10.6-10.7 5.2-5 10.6-9.9 16-14.6 2.8-2.3 5.5-4.7 8.3-7l4.2-3.4 4.3-3.3c11.3-8.9 23-17.1 35.1-24.7 12.1-7.7 24.5-14.5 37.2-20.9 25.4-12.7 52.1-22.3 79.5-28.8 13.7-3.2 27.6-5.4 41.6-6.7s28.1-1.4 42.1-.1c-4 2.9-8 5.5-12 8-1.9 1.2-3.8 2.5-5.7 3.7-2.9 1.9-5.8 3.8-8.8 5.6l-.3.2c-1.4.9-2.7 1.7-4.1 2.6l-4.3 2.8c-7.4 4.7-14.6 9.4-21.9 14.1-4.1 2.6-8.1 5.3-12.2 7.9-22.3 14.6-44 29.3-65.2 44.5-21.2 15.1-41.9 30.6-62.1 46.7-1.7 1.4-3.4 2.7-5.1 4.1-3.3 2.7-6.7 5.3-10 8.1-3.4 2.7-6.7 5.5-10 8.3-1.6 1.4-3.2 2.7-4.8 4.1-1 .9-2 1.8-3.1 2.6-3.8 3.3-7.7 6.6-11.4 10-1.3 1.2-2.6 2.3-3.8 3.4-1.1 1-2.2 1.9-3.2 2.9l-6.4 5.9-26.9 24.8-17.5-24.7c-.3-.5-1-1.3-1.5-1.9l-1.7-2.1-3.4-4.3-7-8.7c-4.7-5.8-9.5-11.6-14.3-17.3-9.6-11.5-19.5-22.9-29.5-34.2-10.1-11.2-20.3-22.3-31.2-33-11-11.2-22.6-21.6-34.9-31.1m158.4 375.8c-23.9 0-47.3-6.7-67.6-19.2s-36.7-30.4-47.2-51.6l-76.4 32.6c22.7 48 62.8 85.6 112.4 105.4s104.8 20.2 154.7 1.2l-32.8-75.7c-13.9 4.8-28.4 7.3-43.1 7.3M118 240.3c-10.8 19-16.5 40.5-16.5 62.4 0 13.4 2.1 26.7 6.3 39.4l-76.5 32.6c-16.1-43.6-17.1-91.2-2.9-135.4s42.8-82.5 81.2-108.8l53.7 63.5c-18.9 11.3-34.5 27.2-45.3 46.3m239-104.5-71.7 52.5c24.2 11.6 44.1 30.5 56.9 53.8l76.5-32.6c-14.6-28.9-35.7-54.2-61.7-73.7m69.1 90.4c9.7 24.4 14.7 50.3 14.6 76.5 0 39.2-11.2 77.6-32.1 110.8s-50.9 60-86.4 77.2L289.4 415c27.5-14.4 48.7-38.1 59.8-66.9 11.1-28.7 11.3-60.5.6-89.4z" class="st0"/><path d="M71.2 53.9c16.1.3 32 3.5 47.2 9.2 15.2 5.6 29.8 12.5 43.8 20.8 13.9 8.2 27.3 17.2 40 27.2 4.2 3.3 8.3 6.6 12.4 10 3.5-3.6 7-7.2 10.6-10.7 5.2-5 10.6-9.9 16-14.6 2.8-2.3 5.5-4.7 8.3-7l4.2-3.4 4.3-3.3c11.3-8.9 23-17.1 35.1-24.7 12.1-7.7 24.5-14.5 37.2-20.9 25.4-12.7 52.1-22.3 79.5-28.8 13.7-3.2 27.6-5.4 41.6-6.7s28.1-1.4 42.1-.1c-4 2.9-8 5.5-12 8-1.9 1.2-3.8 2.5-5.7 3.7-2.9 1.9-5.8 3.8-8.8 5.6l-.3.2c-1.4.9-2.7 1.7-4.1 2.6l-4.3 2.8c-7.4 4.7-14.6 9.4-21.9 14.1-4.1 2.6-8.1 5.3-12.2 7.9-22.3 14.6-44 29.3-65.2 44.5-21.2 15.1-41.9 30.6-62.1 46.7-1.7 1.4-3.4 2.7-5.1 4.1-3.3 2.7-6.7 5.3-10 8.1-3.4 2.7-6.7 5.5-10 8.3-1.6 1.4-3.2 2.7-4.8 4.1-1 .9-2 1.8-3.1 2.6-3.8 3.3-7.7 6.6-11.4 10-1.3 1.2-2.6 2.3-3.8 3.4-1.1 1-2.2 1.9-3.2 2.9l-6.4 5.9-26.9 24.8-17.5-24.7c-.3-.5-1-1.3-1.5-1.9l-1.7-2.1-3.4-4.3-7-8.7c-4.7-5.8-9.5-11.6-14.3-17.3-9.6-11.5-19.5-22.9-29.5-34.2-10.1-11.2-20.3-22.3-31.2-33-11-11.2-22.6-21.6-34.9-31.1m158.4 375.8c-23.9 0-47.3-6.7-67.6-19.2s-36.7-30.4-47.2-51.6l-76.4 32.6c22.7 48 62.8 85.6 112.4 105.4s104.8 20.2 154.7 1.2l-32.8-75.7c-13.9 4.8-28.4 7.3-43.1 7.3M118 240.3c-10.8 19-16.5 40.5-16.5 62.4 0 13.4 2.1 26.7 6.3 39.4l-76.5 32.6c-16.1-43.6-17.1-91.2-2.9-135.4s42.8-82.5 81.2-108.8l53.7 63.5c-18.9 11.3-34.5 27.2-45.3 46.3m239-104.5-71.7 52.5c24.2 11.6 44.1 30.5 56.9 53.8l76.5-32.6c-14.6-28.9-35.7-54.2-61.7-73.7m69.1 90.4c9.7 24.4 14.7 50.3 14.6 76.5 0 39.2-11.2 77.6-32.1 110.8s-50.9 60-86.4 77.2L289.4 415c27.5-14.4 48.7-38.1 59.8-66.9 11.1-28.7 11.3-60.5.6-89.4z" class="st0"/></svg>

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB