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,8 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" 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:#f2f2f2;}
</style>
<g>
<path class="st0" d="M240.4,0C144.9-0.3-38.8,218.6,29.8,276.6l16.9,14.3c-4.5,12.2-6.2,25.3-4.7,38.2c1.8,17.9,11.1,35.1,26,48.3 C82.2,390,100.9,398,119,398c30,69.1,98.6,111.5,178.9,113.9c86.2,2.6,158.6-37.9,188.9-110.5c2-5.1,10.4-28.1,10.4-48.4 c0-20.4-11.5-28.8-18.9-28.8c-0.2-0.8-1.7-6.1-3.7-12.5s-4.1-10.9-4.1-10.9c8-12,8.1-22.7,7.1-28.8c-1.1-7.5-4.3-13.9-10.6-20.6 c-6.3-6.6-19.2-13.4-37.4-18.5l-9.5-2.6c0-0.4-0.5-22.5-0.9-31.9c-0.3-6.8-0.9-17.5-4.2-28.1c-4-14.3-10.8-26.7-19.4-34.7 c23.7-24.6,38.5-51.7,38.5-74.9C434,16,379.1,2.5,311.5,30.5l-14.3,6.1c-8.7-8.6-17.5-17.2-26.3-25.7C262.5,3.4,252.1,0,240.4,0z M241.9,18.6c3.5,0,6.9,0.4,9.9,1.2c6.3,1.8,27.3,26.1,27.3,26.1s-39,21.6-75.1,51.8c-48.6,37.5-85.4,92-107.5,151.1 C79.3,252.2,64,262,54.7,275.5c-5.6-4.7-16-13.7-17.8-17.2C22,230,53.1,175.1,74.9,144C124.5,73.4,199.9,18.5,241.9,18.6z M312,88.4c0.9,0,1.3,1.1,0.6,1.6c-3.1,2.3-6.4,5.5-8.8,8.8c-0.3,0.4-0.2,0.9,0.2,1.2c0.1,0.1,0.3,0.2,0.5,0.2 c14.1,0.1,33.9,5,46.8,12.2c0.9,0.5,0.3,2.2-0.7,2c-19.5-4.5-51.5-7.9-84.7,0.2c-29.7,7.3-52.3,18.4-68.8,30.4 c-0.9,0.6-1.8-0.5-1.2-1.3c19.1-22.1,42.6-41.3,63.7-52.1c0.7-0.4,1.5,0.4,1.1,1.1c-1.7,3.1-4.9,9.5-5.9,14.5 c-0.1,0.7,0.7,1.3,1.3,0.9C269.2,99.2,292,89.7,312,88.4L312,88.4z M376.5,156.8h1.2c3.5,0.1,6.8,1.2,9.7,3.1 c11.4,7.6,13,25.9,13.6,39.4c0.3,7.7,1.3,26.2,1.6,31.5c0.7,12.2,3.9,13.9,10.4,16c3.6,1.2,7,2.1,12,3.5c15.1,4.2,24,8.5,29.7,14 c3.3,3.5,4.9,7.1,5.4,10.6c1.8,13-10.1,29-41.4,43.5c-34.3,15.9-75.9,19.9-104.6,16.7l-10-1.1c-23-3.1-36.1,26.6-22.3,47 c8.9,13.1,33.1,21.7,57.3,21.7c55.6,0,98.2-23.7,114.1-44.2c0.5-0.6,0.9-1.2,1.3-1.8c0.8-1.2,0.1-1.8-0.9-1.2 c-13,8.9-70.6,44.1-132.3,33.5c0,0-7.5-1.2-14.3-3.9c-5.4-2.1-16.8-7.3-18.2-19c49.8,15.4,81.1,0.8,81.1,0.8c0.6-0.3,1-0.9,0.9-1.5 c-0.1-0.8-0.8-1.4-1.6-1.3l0,0c0,0-40.8,6-79.3-8.1c4.2-13.7,15.4-8.7,32.2-7.4c26.2,1.6,52.5-1.3,77.8-8.4 c17.5-5,40.4-14.9,58.2-28.9c6,13.2,8.1,27.7,8.1,27.7s4.7-0.9,8.5,1.6c3.7,2.3,6.4,7,4.5,19.1c-3.8,22.7-13.4,41.1-29.6,58 c-10.1,10.9-22.2,19.9-35.5,26.5c-7.3,3.8-15,7.1-23.2,9.8c-61.1,19.9-123.6-2-143.8-49.1c-1.6-3.6-3-7.3-4-11.1 c-8.6-31-1.3-68.3,21.5-91.7c1.4-1.5,2.8-3.3,2.8-5.5c0-1.9-1.2-3.8-2.2-5.2c-8-11.6-35.6-31.3-30.1-69.4 c4-27.4,27.9-46.7,50.3-45.5c1.9,0.1,3.8,0.2,5.7,0.3c9.7,0.6,18.1,1.8,26.1,2.1c13.3,0.6,25.3-1.3,39.5-13.2 c4.8-4,8.6-7.5,15.1-8.6C372.5,157.3,373.9,156.8,376.5,156.8L376.5,156.8z M377,203.3c-0.4,0-0.9,0-1.3,0.1 c-7.1,1.2-7.4,10-4.9,22.2c1.5,6.8,4,12.7,6.8,16.3c3.7-0.4,7.3-0.5,10.6,0c1.9-4.4,2.2-11.9,0.5-20.1 C386.4,210.4,383.2,203.2,377,203.3L377,203.3z M298.9,236.3c-7.8,0-15.4,2.4-21.7,7c-3.4,2.5-6.6,6-6.2,8.1 c0.2,0.7,0.7,1.2,1.9,1.3c2.8,0.3,12.6-4.6,23.9-5.3c8-0.5,14.6,2,19.7,4.3c5.1,2.2,8.2,3.7,9.5,2.4c0.8-0.8,0.6-2.3-0.7-4.4 c-2.5-4.1-7.7-8.3-13.2-10.6C308,237.3,303.4,236.3,298.9,236.3z M386,253.6c-3.6-0.1-6.7,4-6.8,9c-0.1,5,2.8,9.2,6.5,9.2 c3.7,0.1,6.7-3.9,6.8-9C392.5,257.8,389.6,253.6,386,253.6z M309.6,257.3c-1.1,0-2.2,0-3.3,0.2c-6.6,1.1-10.3,3.2-12.7,5.3 c-2,1.7-3.2,3.7-3.2,5.1c0,0.9,0.7,1.6,1.6,1.6l0,0c1.5,0,4.9-1.3,4.9-1.3c6.8-2.6,14.2-3.3,21.4-2.2c3.3,0.4,4.9,0.6,5.7-0.6 c0.2-0.3,0.5-1-0.2-2.1C322.3,260.9,317,257.4,309.6,257.3L309.6,257.3z M357.8,265.8c-2.7,0-5,1.1-6,3.2c-1.6,3.3,0.7,7.7,5.2,9.9 c4.5,2.2,9.5,1.3,11.1-1.9c1.6-3.3-0.7-7.8-5.2-10C361.3,266.2,359.6,265.8,357.8,265.8L357.8,265.8z M109.6,266.3 c1,0,2.1,0,3.2,0.1c15.6,0.9,38.5,12.8,43.8,46.7c4.6,30.1-2.7,60.6-30.9,65.5c-2.6,0.4-5.3,0.6-8,0.6c-26-0.7-54.2-24.1-57-51.9 c-3.1-30.7,12.6-54.4,40.4-60C103.6,266.7,106.5,266.3,109.6,266.3L109.6,266.3z M108.1,286.1c-6.8-0.1-13.4,2.8-18.1,7.8 c-8.1,8.9-9.4,21.1-7.8,25.4c0.6,1.6,1.5,2,2.1,2.1c1.4,0.2,3.4-0.8,4.7-4.3c0.1-0.4,0.3-0.7,0.4-1.1c0.8-2.8,1.9-5.4,3.3-7.9 c4.4-6.8,13.5-8.7,20.3-4.3l0,0c5.7,3.7,7.9,10.7,5.4,17.3c-1.2,3.4-3.3,10-2.8,15.4c0.9,10.9,7.6,15.3,13.7,15.7 c5.8,0.2,9.9-3.1,11-5.5c0.6-1.4,0.1-2.3-0.2-2.7c-0.9-1.1-2.4-0.8-3.8-0.4c-1.1,0.3-2.3,0.5-3.4,0.5c-2.5,0.1-4.8-1.1-6.3-3.2 c-1.7-2.6-1.6-6.4,0.3-10.8c0.2-0.6,0.5-1.2,0.9-2c2.9-6.6,7.9-17.6,2.3-28.1c-4.2-7.9-10.9-12.8-19.1-13.9 C110.1,286.1,109.1,286.1,108.1,286.1L108.1,286.1z" fill="#000000"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><path d="M240.4 0C144.9-.3-38.8 218.6 29.8 276.6l16.9 14.3c-4.5 12.2-6.2 25.3-4.7 38.2 1.8 17.9 11.1 35.1 26 48.3C82.2 390 100.9 398 119 398c30 69.1 98.6 111.5 178.9 113.9 86.2 2.6 158.6-37.9 188.9-110.5 2-5.1 10.4-28.1 10.4-48.4 0-20.4-11.5-28.8-18.9-28.8-.2-.8-1.7-6.1-3.7-12.5s-4.1-10.9-4.1-10.9c8-12 8.1-22.7 7.1-28.8-1.1-7.5-4.3-13.9-10.6-20.6-6.3-6.6-19.2-13.4-37.4-18.5l-9.5-2.6c0-.4-.5-22.5-.9-31.9-.3-6.8-.9-17.5-4.2-28.1-4-14.3-10.8-26.7-19.4-34.7 23.7-24.6 38.5-51.7 38.5-74.9-.1-44.7-55-58.2-122.6-30.2l-14.3 6.1c-8.7-8.6-17.5-17.2-26.3-25.7C262.5 3.4 252.1 0 240.4 0m1.5 18.6c3.5 0 6.9.4 9.9 1.2 6.3 1.8 27.3 26.1 27.3 26.1s-39 21.6-75.1 51.8c-48.6 37.5-85.4 92-107.5 151.1-17.2 3.4-32.5 13.2-41.8 26.7-5.6-4.7-16-13.7-17.8-17.2C22 230 53.1 175.1 74.9 144c49.6-70.6 125-125.5 167-125.4M312 88.4c.9 0 1.3 1.1.6 1.6-3.1 2.3-6.4 5.5-8.8 8.8-.3.4-.2.9.2 1.2.1.1.3.2.5.2 14.1.1 33.9 5 46.8 12.2.9.5.3 2.2-.7 2-19.5-4.5-51.5-7.9-84.7.2-29.7 7.3-52.3 18.4-68.8 30.4-.9.6-1.8-.5-1.2-1.3 19.1-22.1 42.6-41.3 63.7-52.1.7-.4 1.5.4 1.1 1.1-1.7 3.1-4.9 9.5-5.9 14.5-.1.7.7 1.3 1.3.9 13.1-8.9 35.9-18.4 55.9-19.7m64.5 68.4h1.2c3.5.1 6.8 1.2 9.7 3.1 11.4 7.6 13 25.9 13.6 39.4.3 7.7 1.3 26.2 1.6 31.5.7 12.2 3.9 13.9 10.4 16 3.6 1.2 7 2.1 12 3.5 15.1 4.2 24 8.5 29.7 14 3.3 3.5 4.9 7.1 5.4 10.6 1.8 13-10.1 29-41.4 43.5-34.3 15.9-75.9 19.9-104.6 16.7l-10-1.1c-23-3.1-36.1 26.6-22.3 47 8.9 13.1 33.1 21.7 57.3 21.7 55.6 0 98.2-23.7 114.1-44.2.5-.6.9-1.2 1.3-1.8.8-1.2.1-1.8-.9-1.2-13 8.9-70.6 44.1-132.3 33.5 0 0-7.5-1.2-14.3-3.9-5.4-2.1-16.8-7.3-18.2-19 49.8 15.4 81.1.8 81.1.8.6-.3 1-.9.9-1.5-.1-.8-.8-1.4-1.6-1.3 0 0-40.8 6-79.3-8.1 4.2-13.7 15.4-8.7 32.2-7.4 26.2 1.6 52.5-1.3 77.8-8.4 17.5-5 40.4-14.9 58.2-28.9 6 13.2 8.1 27.7 8.1 27.7s4.7-.9 8.5 1.6c3.7 2.3 6.4 7 4.5 19.1-3.8 22.7-13.4 41.1-29.6 58-10.1 10.9-22.2 19.9-35.5 26.5-7.3 3.8-15 7.1-23.2 9.8-61.1 19.9-123.6-2-143.8-49.1-1.6-3.6-3-7.3-4-11.1-8.6-31-1.3-68.3 21.5-91.7 1.4-1.5 2.8-3.3 2.8-5.5 0-1.9-1.2-3.8-2.2-5.2-8-11.6-35.6-31.3-30.1-69.4 4-27.4 27.9-46.7 50.3-45.5l5.7.3c9.7.6 18.1 1.8 26.1 2.1 13.3.6 25.3-1.3 39.5-13.2 4.8-4 8.6-7.5 15.1-8.6.7.2 2.1-.3 4.7-.3m.5 46.5c-.4 0-.9 0-1.3.1-7.1 1.2-7.4 10-4.9 22.2 1.5 6.8 4 12.7 6.8 16.3 3.7-.4 7.3-.5 10.6 0 1.9-4.4 2.2-11.9.5-20.1-2.3-11.4-5.5-18.6-11.7-18.5m-78.1 33c-7.8 0-15.4 2.4-21.7 7-3.4 2.5-6.6 6-6.2 8.1.2.7.7 1.2 1.9 1.3 2.8.3 12.6-4.6 23.9-5.3 8-.5 14.6 2 19.7 4.3 5.1 2.2 8.2 3.7 9.5 2.4.8-.8.6-2.3-.7-4.4-2.5-4.1-7.7-8.3-13.2-10.6-4.1-1.8-8.7-2.8-13.2-2.8m87.1 17.3c-3.6-.1-6.7 4-6.8 9s2.8 9.2 6.5 9.2c3.7.1 6.7-3.9 6.8-9 0-5-2.9-9.2-6.5-9.2m-76.4 3.7c-1.1 0-2.2 0-3.3.2-6.6 1.1-10.3 3.2-12.7 5.3-2 1.7-3.2 3.7-3.2 5.1 0 .9.7 1.6 1.6 1.6 1.5 0 4.9-1.3 4.9-1.3 6.8-2.6 14.2-3.3 21.4-2.2 3.3.4 4.9.6 5.7-.6.2-.3.5-1-.2-2.1-1.5-2.4-6.8-5.9-14.2-6m48.2 8.5c-2.7 0-5 1.1-6 3.2-1.6 3.3.7 7.7 5.2 9.9s9.5 1.3 11.1-1.9c1.6-3.3-.7-7.8-5.2-10q-2.4-1.2-5.1-1.2m-248.2.5c1 0 2.1 0 3.2.1 15.6.9 38.5 12.8 43.8 46.7 4.6 30.1-2.7 60.6-30.9 65.5-2.6.4-5.3.6-8 .6-26-.7-54.2-24.1-57-51.9-3.1-30.7 12.6-54.4 40.4-60 2.5-.6 5.4-1 8.5-1m-1.5 19.8c-6.8-.1-13.4 2.8-18.1 7.8-8.1 8.9-9.4 21.1-7.8 25.4.6 1.6 1.5 2 2.1 2.1 1.4.2 3.4-.8 4.7-4.3.1-.4.3-.7.4-1.1.8-2.8 1.9-5.4 3.3-7.9 4.4-6.8 13.5-8.7 20.3-4.3 5.7 3.7 7.9 10.7 5.4 17.3-1.2 3.4-3.3 10-2.8 15.4.9 10.9 7.6 15.3 13.7 15.7 5.8.2 9.9-3.1 11-5.5.6-1.4.1-2.3-.2-2.7-.9-1.1-2.4-.8-3.8-.4-1.1.3-2.3.5-3.4.5-2.5.1-4.8-1.1-6.3-3.2-1.7-2.6-1.6-6.4.3-10.8.2-.6.5-1.2.9-2 2.9-6.6 7.9-17.6 2.3-28.1-4.2-7.9-10.9-12.8-19.1-13.9z" style="fill:#f2f2f2"/></svg>

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB