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 -26
View File
@@ -1,26 +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:#3A76F0;}
</style>
<g>
<path class="st0" d="M194.6,7.5l5.8,23.3C177.7,36.3,156,45.3,136,57.3l-12.3-20.6C145.7,23.5,169.6,13.6,194.6,7.5z M317.4,7.5
l-5.8,23.3c22.7,5.6,44.3,14.5,64.3,26.6l12.4-20.6C366.4,23.5,342.4,13.6,317.4,7.5z M36.8,123.7c-13.3,22-23.2,45.9-29.3,70.9
l23.3,5.8c5.6-22.7,14.5-44.3,26.6-64.3L36.8,123.7z M24,256c0-11.6,0.9-23.3,2.6-34.8l-23.7-3.6c-3.8,25.4-3.8,51.3,0,76.7
l23.7-3.6C24.9,279.2,24,267.6,24,256z M388.3,475.2L376,454.6c-20,12.1-41.6,21-64.2,26.6l5.8,23.3
C342.5,498.3,366.3,488.4,388.3,475.2z M488,256c0,11.6-0.9,23.3-2.6,34.8l23.7,3.6c3.8-25.4,3.8-51.3,0-76.7l-23.7,3.6
C487.1,232.7,488,244.3,488,256z M504.5,317.4l-23.3-5.8c-5.6,22.7-14.5,44.3-26.6,64.3l20.6,12.4
C488.5,366.3,498.4,342.4,504.5,317.4z M290.8,485.4c-23,3.5-46.5,3.5-69.5,0l-3.6,23.7c25.4,3.8,51.3,3.8,76.7,0L290.8,485.4z
M442.8,393.6c-13.8,18.7-30.4,35.3-49.2,49.1l14.2,19.3c20.7-15.2,39-33.4,54.2-54.1L442.8,393.6z M393.6,69.2
c18.8,13.8,35.3,30.4,49.2,49.2l19.3-14.4c-15.2-20.6-33.4-38.9-54.1-54.1L393.6,69.2z M69.3,118.4c13.8-18.8,30.4-35.3,49.2-49.2
L104,49.9C83.4,65.1,65.2,83.4,49.9,104L69.3,118.4z M475.2,123.7L454.6,136c12.1,20,21,41.6,26.6,64.2l23.3-5.8
C498.4,169.5,488.5,145.7,475.2,123.7z M221.2,26.6c23-3.5,46.5-3.5,69.5,0l3.6-23.7c-25.4-3.8-51.3-3.8-76.7,0L221.2,26.6z
M81.6,468.4L32,480l11.6-49.6l-23.4-5.5L8.7,474.5c-3,12.9,5,25.8,17.9,28.8c3.6,0.8,7.3,0.8,10.9,0L87,492L81.6,468.4z
M25.2,403.5l23.4,5.4l8-34.4c-11.7-19.6-20.4-40.8-25.8-63l-23.3,5.8c5.2,21.2,13.1,41.7,23.6,60.8L25.2,403.5z M137.2,455.5
l-34.4,8l5.4,23.4l25.3-5.9c19.2,10.4,39.6,18.4,60.8,23.6l5.8-23.3c-22.1-5.5-43.3-14.3-62.8-26L137.2,455.5z M256,48
C141.1,48.1,48.1,141.2,48.1,256.1c0,39.1,11.1,77.4,31.9,110.6L60,452l85.3-20c97.2,61.2,225.6,32.1,286.8-65.1
S464.2,141.2,367,80C333.8,59.1,295.3,48,256,48L256,48z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><path d="m194.6 7.5 5.8 23.3C177.7 36.3 156 45.3 136 57.3l-12.3-20.6c22-13.2 45.9-23.1 70.9-29.2m122.8 0-5.8 23.3c22.7 5.6 44.3 14.5 64.3 26.6l12.4-20.6c-21.9-13.3-45.9-23.2-70.9-29.3M36.8 123.7c-13.3 22-23.2 45.9-29.3 70.9l23.3 5.8c5.6-22.7 14.5-44.3 26.6-64.3zM24 256c0-11.6.9-23.3 2.6-34.8l-23.7-3.6c-3.8 25.4-3.8 51.3 0 76.7l23.7-3.6C24.9 279.2 24 267.6 24 256m364.3 219.2L376 454.6c-20 12.1-41.6 21-64.2 26.6l5.8 23.3c24.9-6.2 48.7-16.1 70.7-29.3M488 256c0 11.6-.9 23.3-2.6 34.8l23.7 3.6c3.8-25.4 3.8-51.3 0-76.7l-23.7 3.6c1.7 11.4 2.6 23 2.6 34.7m16.5 61.4-23.3-5.8c-5.6 22.7-14.5 44.3-26.6 64.3l20.6 12.4c13.3-22 23.2-45.9 29.3-70.9m-213.7 168c-23 3.5-46.5 3.5-69.5 0l-3.6 23.7c25.4 3.8 51.3 3.8 76.7 0zm152-91.8c-13.8 18.7-30.4 35.3-49.2 49.1l14.2 19.3c20.7-15.2 39-33.4 54.2-54.1zM393.6 69.2c18.8 13.8 35.3 30.4 49.2 49.2l19.3-14.4c-15.2-20.6-33.4-38.9-54.1-54.1zM69.3 118.4c13.8-18.8 30.4-35.3 49.2-49.2L104 49.9C83.4 65.1 65.2 83.4 49.9 104zm405.9 5.3L454.6 136c12.1 20 21 41.6 26.6 64.2l23.3-5.8c-6.1-24.9-16-48.7-29.3-70.7m-254-97.1c23-3.5 46.5-3.5 69.5 0l3.6-23.7c-25.4-3.8-51.3-3.8-76.7 0zM81.6 468.4 32 480l11.6-49.6-23.4-5.5-11.5 49.6c-3 12.9 5 25.8 17.9 28.8 3.6.8 7.3.8 10.9 0L87 492zm-56.4-64.9 23.4 5.4 8-34.4c-11.7-19.6-20.4-40.8-25.8-63l-23.3 5.8c5.2 21.2 13.1 41.7 23.6 60.8zm112 52-34.4 8 5.4 23.4 25.3-5.9c19.2 10.4 39.6 18.4 60.8 23.6l5.8-23.3c-22.1-5.5-43.3-14.3-62.8-26zM256 48c-114.9.1-207.9 93.2-207.9 208.1 0 39.1 11.1 77.4 31.9 110.6L60 452l85.3-20c97.2 61.2 225.6 32.1 286.8-65.1S464.2 141.2 367 80c-33.2-20.9-71.7-32-111-32" style="fill:#3a76f0"/></svg>

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB