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 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" enable-background="new 0 0 1024 1024" version="1.1" viewBox="0 0 1024 1024" xml:space="preserve"><circle id="XMLID_1_" cx="512" cy="512" r="512" fill="#93C4D3"/><g><path fill="none" d="M747.9,351.9c-78.6-98.9-225.4-121-335-49.9c-57.9,37.5-93.7,88.6-98.1,159.5c-1.6,25.1-4.5,50.3-9.2,74.9 c-5.1,26.8-18.4,48.8-46.8,57.2c-7.8,2.3-16.1,3-25.1,4.6c19.6,30.5,63.6,62.1,106.7,76.2c1.8,0.6,4,0.7,6.2,0.6 c13-13.3,31.1-21.6,51.1-21.6c29.5,0,54.8,17.9,65.7,43.4c27.8,0.1,55.6,0.4,83.4,1c1.7,0,3.3-0.1,4.8-0.2 c10.7-26,36.2-44.3,66-44.3c18.6,0,35.5,7.1,48.2,18.7c6.9-0.9,13.2-4.4,20-8.8c3.6-2.3,7.3-4.6,10.9-7.1 C803,584,825.6,449.7,747.9,351.9z M627.1,393c17.2,0,31.1,13.9,31.1,31.1c0,17.2-13.9,31.1-31.1,31.1c-17.2,0-31.1-13.9-31.1-31.1 C596,407,609.9,393,627.1,393z M479.1,393c17.2,0,31.1,13.9,31.1,31.1c0,17.2-13.9,31.1-31.1,31.1c-17.2,0-31.1-13.9-31.1-31.1 C448,406.9,461.9,393,479.1,393z M665.8,518.3c-11.4,39-52.3,70-97.8,73.9c-5.1,0.4-10.2,0.6-13.3,0.7 c-51.7,0.1-95.6-28.1-110-69.6c-1.3-3.7-2.5-7.5-2.9-11.4c-1.2-9.6,3-16.4,12.4-18.5c8.9-2,15.3,2.1,18.8,10.5 c22.1,54,79.8,73.1,129.9,43c15.3-9.2,26.7-21.7,32.1-39.2c3.5-11.4,11.8-15.9,21.4-12.7C665.6,498,669.1,506.9,665.8,518.3z"/><path fill="#FFF" d="M774.6,333c-86.1-109.8-246.9-138-370.2-64.2c-73.3,43.8-117.9,106.2-122.6,194 c-1.3,23.5-4.5,47.1-9.3,70.1c-4.9,23.2-15.3,30.2-39.1,31.4c-14.2,0.7-25.2,6.4-31.2,19.5c-6,13.2-2.9,25.1,5.9,36.3 c23.7,30.4,53,53.8,87.4,70.9c11,5.5,22.3,10.1,33.3,15.1c-1.6,6-2.5,12.3-2.5,18.8c0,17.2,6.1,33,16.2,45.3 c2.6,3.3,5.5,6.3,8.7,8.9c12.5,10.7,28.7,17.2,46.4,17.2c37.4,0,68-28.7,71.1-65.3c26,0,52,0,77.7,0c3.1,36.6,33.7,65.3,71.1,65.3 c39.4,0,71.4-32,71.4-71.4c0-8.1-1.4-15.8-3.8-23c10.4-6.3,20.5-12,30.1-18.5C836.5,601.3,862.8,445.5,774.6,333z M398.7,754.8 c-17.2,0-31.1-13.9-31.1-31.1c0-17.2,13.9-31.1,31.1-31.1c17.2,0,31.1,13.9,31.1,31.1C429.8,740.9,415.9,754.8,398.7,754.8z M620.8,754.8c-17.2,0-31.1-13.9-31.1-31.1c0-17.2,13.9-31.1,31.1-31.1c17.2,0,31.1,13.9,31.1,31.1 C651.9,740.9,638,754.8,620.8,754.8z M696.7,656.2c-3.6,2.4-7.3,4.7-10.9,7.1c-6.9,4.4-13.1,8-20,8.8 c-12.7-11.6-29.6-18.7-48.2-18.7c-29.8,0-55.4,18.3-66,44.3c-1.5,0.2-3.1,0.3-4.8,0.2c-27.8-0.7-55.6-0.9-83.4-1 c-10.9-25.5-36.2-43.4-65.7-43.4c-20,0-38.1,8.3-51.1,21.6c-2.2,0.2-4.4,0-6.2-0.6c-43.1-14.1-87.1-45.7-106.7-76.2 c9-1.6,17.3-2.3,25.1-4.6c28.4-8.4,41.7-30.4,46.8-57.2c4.7-24.7,7.7-49.9,9.2-74.9c4.4-70.9,40.3-122,98.1-159.5 c109.6-71,256.4-49,335,49.9C825.6,449.7,803,584,696.7,656.2z"/><path fill="#FFF" d="M656.4,495.1c-9.7-3.1-17.9,1.4-21.4,12.7c-5.5,17.5-16.8,30-32.1,39.2c-50.1,30.1-107.8,11-129.9-43 c-3.4-8.4-9.9-12.5-18.8-10.5c-9.5,2.1-13.6,8.9-12.4,18.5c0.5,3.9,1.7,7.7,2.9,11.4c14.4,41.4,58.3,69.7,110,69.6 c3.1-0.2,8.2-0.3,13.3-0.7c45.5-4,86.4-34.9,97.8-73.9C669.1,506.9,665.6,498,656.4,495.1z"/><circle cx="479.1" cy="424.1" r="31.1" fill="#FFF"/><circle cx="627.1" cy="424.1" r="31.1" fill="#FFF"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 1024 1024"><circle cx="512" cy="512" r="512" fill="#93C4D3"/><path fill="none" d="M747.9 351.9c-78.6-98.9-225.4-121-335-49.9-57.9 37.5-93.7 88.6-98.1 159.5-1.6 25.1-4.5 50.3-9.2 74.9-5.1 26.8-18.4 48.8-46.8 57.2-7.8 2.3-16.1 3-25.1 4.6 19.6 30.5 63.6 62.1 106.7 76.2 1.8.6 4 .7 6.2.6 13-13.3 31.1-21.6 51.1-21.6 29.5 0 54.8 17.9 65.7 43.4 27.8.1 55.6.4 83.4 1 1.7 0 3.3-.1 4.8-.2 10.7-26 36.2-44.3 66-44.3 18.6 0 35.5 7.1 48.2 18.7 6.9-.9 13.2-4.4 20-8.8 3.6-2.3 7.3-4.6 10.9-7.1C803 584 825.6 449.7 747.9 351.9M627.1 393c17.2 0 31.1 13.9 31.1 31.1s-13.9 31.1-31.1 31.1-31.1-13.9-31.1-31.1c0-17.1 13.9-31.1 31.1-31.1m-148 0c17.2 0 31.1 13.9 31.1 31.1s-13.9 31.1-31.1 31.1-31.1-13.9-31.1-31.1 13.9-31.1 31.1-31.1m186.7 125.3c-11.4 39-52.3 70-97.8 73.9-5.1.4-10.2.6-13.3.7-51.7.1-95.6-28.1-110-69.6-1.3-3.7-2.5-7.5-2.9-11.4-1.2-9.6 3-16.4 12.4-18.5 8.9-2 15.3 2.1 18.8 10.5 22.1 54 79.8 73.1 129.9 43 15.3-9.2 26.7-21.7 32.1-39.2 3.5-11.4 11.8-15.9 21.4-12.7 9.2 3 12.7 11.9 9.4 23.3"/><path fill="#FFF" d="M774.6 333c-86.1-109.8-246.9-138-370.2-64.2-73.3 43.8-117.9 106.2-122.6 194-1.3 23.5-4.5 47.1-9.3 70.1-4.9 23.2-15.3 30.2-39.1 31.4-14.2.7-25.2 6.4-31.2 19.5-6 13.2-2.9 25.1 5.9 36.3 23.7 30.4 53 53.8 87.4 70.9 11 5.5 22.3 10.1 33.3 15.1-1.6 6-2.5 12.3-2.5 18.8 0 17.2 6.1 33 16.2 45.3 2.6 3.3 5.5 6.3 8.7 8.9 12.5 10.7 28.7 17.2 46.4 17.2 37.4 0 68-28.7 71.1-65.3h77.7c3.1 36.6 33.7 65.3 71.1 65.3 39.4 0 71.4-32 71.4-71.4 0-8.1-1.4-15.8-3.8-23 10.4-6.3 20.5-12 30.1-18.5 121.3-82.1 147.6-237.9 59.4-350.4M398.7 754.8c-17.2 0-31.1-13.9-31.1-31.1s13.9-31.1 31.1-31.1 31.1 13.9 31.1 31.1-13.9 31.1-31.1 31.1m222.1 0c-17.2 0-31.1-13.9-31.1-31.1s13.9-31.1 31.1-31.1 31.1 13.9 31.1 31.1-13.9 31.1-31.1 31.1m75.9-98.6c-3.6 2.4-7.3 4.7-10.9 7.1-6.9 4.4-13.1 8-20 8.8-12.7-11.6-29.6-18.7-48.2-18.7-29.8 0-55.4 18.3-66 44.3-1.5.2-3.1.3-4.8.2-27.8-.7-55.6-.9-83.4-1-10.9-25.5-36.2-43.4-65.7-43.4-20 0-38.1 8.3-51.1 21.6-2.2.2-4.4 0-6.2-.6-43.1-14.1-87.1-45.7-106.7-76.2 9-1.6 17.3-2.3 25.1-4.6 28.4-8.4 41.7-30.4 46.8-57.2 4.7-24.7 7.7-49.9 9.2-74.9 4.4-70.9 40.3-122 98.1-159.5 109.6-71 256.4-49 335 49.9 77.7 97.7 55.1 232-51.2 304.2"/><path fill="#FFF" d="M656.4 495.1c-9.7-3.1-17.9 1.4-21.4 12.7-5.5 17.5-16.8 30-32.1 39.2-50.1 30.1-107.8 11-129.9-43-3.4-8.4-9.9-12.5-18.8-10.5-9.5 2.1-13.6 8.9-12.4 18.5.5 3.9 1.7 7.7 2.9 11.4 14.4 41.4 58.3 69.7 110 69.6 3.1-.2 8.2-.3 13.3-.7 45.5-4 86.4-34.9 97.8-73.9 3.3-11.5-.2-20.4-9.4-23.3"/><circle cx="479.1" cy="424.1" r="31.1" fill="#FFF"/><circle cx="627.1" cy="424.1" r="31.1" fill="#FFF"/></svg>

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB