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 -1
View File
@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" preserveAspectRatio="xMinYMin meet" version="1.1" viewBox="0 0 1150 540.6"><g id="Layer_1" fill="#000"><path d="M880.199,2.8 C1028.1,2.8 1147.9,122.6 1147.9,270.5 C1147.9,418.3 1028.1,538.2 880.2,538.2 L290.1,538.2 C269,538.2 251.9,521.1 251.9,500 C251.9,478.9 269,461.8 290.1,461.8 L427.6,461.8 C448.6,461.8 465.7,444.7 465.7,423.6 C465.7,402.5 448.6,385.4 427.6,385.4 L396.999,385.4 C375.9,385.4 358.8,368.3 358.8,347.2 C358.8,326.1 375.9,309 397,309 L488.703,309 C509.918,308.941 526.373,291.65 526.9,270.8 C526.9,249.7 509.8,232.6 488.7,232.6 L167.8,232.6 C146.7,232.6 129.6,215.5 129.6,194.4 C129.6,173.3 146.7,156.2 167.8,156.2 L404.604,156.2 C425.818,156.141 442.273,138.85 442.8,118 C442.8,96.9 425.7,79.8 404.6,79.8 L351.2,79.8 C330.1,79.8 313,62.7 313,41.6 C313,20.5 330.1,2.4 351.2,2.4 L880.199,2.8 z M837.4,92 L837.4,92 C755.2,92 688.7,158.6 688.7,240.7 L688.7,300.2 C688.7,382.4 755.2,448.9 837.4,448.9 C919.5,448.9 986.1,382.4 986.1,300.2 L986.1,240.7 C986.1,158.6 919.5,92 837.4,92 L837.4,92 z M888.2,232.6 C908,232.6 924.1,248.7 924.1,268.5 L924.1,273.1 C924.1,292.9 908,309 888.2,309 L776.6,309 C756.8,309 740.7,292.9 740.7,273.1 L740.7,268.5 C740.7,248.7 756.8,232.6 776.6,232.6 L888.2,232.6 z"/><path d="M170.1,461.8 C190,461.8 206,477.8 206,497.7 L206,502.3 C206,522.1 190,538.2 170.1,538.2 L38,538.2 C18.2,538.2 2.1,522.1 2.1,502.3 L2.1,497.7 C2.1,477.8 18.2,461.8 38,461.8 L170.1,461.8 z"/><path d="M231.3,3.4 C251.1,3.4 267.1,19.5 267.1,39.3 L267.1,44 C267.1,63.8 251.1,79.8 231.3,79.8 L83.8,79.8 C64,79.8 47.9,63.8 47.9,44 L47.9,39.3 C47.9,19.5 64,3.4 83.8,3.4 L231.3,3.4 z"/><path d="M277.1,309 C296.9,309 313,325.1 313,344.9 L313,349.5 C313,369.3 296.9,385.4 277.1,385.4 L196.1,385.4 C176.3,385.4 160.2,369.3 160.2,349.5 L160.2,344.9 C160.2,325.1 176.3,309 196.1,309 L277.1,309 z"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet" viewBox="0 0 1150 540.6"><path d="M880.199 2.8C1028.1 2.8 1147.9 122.6 1147.9 270.5c0 147.8-119.8 267.7-267.7 267.7H290.1c-21.1 0-38.2-17.1-38.2-38.2s17.1-38.2 38.2-38.2h137.5c21 0 38.1-17.1 38.1-38.2s-17.1-38.2-38.1-38.2h-30.601c-21.099 0-38.199-17.1-38.199-38.2S375.9 309 397 309h91.703c21.215-.059 37.67-17.35 38.197-38.2 0-21.1-17.1-38.2-38.2-38.2H167.8c-21.1 0-38.2-17.1-38.2-38.2s17.1-38.2 38.2-38.2h236.804c21.214-.059 37.669-17.35 38.196-38.2 0-21.1-17.1-38.2-38.2-38.2h-53.4c-21.1 0-38.2-17.1-38.2-38.2s17.1-39.2 38.2-39.2zM837.4 92c-82.2 0-148.7 66.6-148.7 148.7v59.5c0 82.2 66.5 148.7 148.7 148.7 82.1 0 148.7-66.5 148.7-148.7v-59.5c0-82.1-66.6-148.7-148.7-148.7m50.8 140.6c19.8 0 35.9 16.1 35.9 35.9v4.6c0 19.8-16.1 35.9-35.9 35.9H776.6c-19.8 0-35.9-16.1-35.9-35.9v-4.6c0-19.8 16.1-35.9 35.9-35.9zM170.1 461.8c19.9 0 35.9 16 35.9 35.9v4.6c0 19.8-16 35.9-35.9 35.9H38c-19.8 0-35.9-16.1-35.9-35.9v-4.6c0-19.9 16.1-35.9 35.9-35.9z"/><path d="M231.3 3.4c19.8 0 35.8 16.1 35.8 35.9V44c0 19.8-16 35.8-35.8 35.8H83.8c-19.8 0-35.9-16-35.9-35.8v-4.7C47.9 19.5 64 3.4 83.8 3.4zM277.1 309c19.8 0 35.9 16.1 35.9 35.9v4.6c0 19.8-16.1 35.9-35.9 35.9h-81c-19.8 0-35.9-16.1-35.9-35.9v-4.6c0-19.8 16.1-35.9 35.9-35.9z"/></svg>

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB