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:svg="http://www.w3.org/2000/svg" id="svg856" width="720.878" height="492.005" version="1.1" viewBox="0 0 190.732 130.176"><metadata id="metadata853"/><g id="layer1" transform="translate(-3.356321,-3.5331223)"><path id="path6" d="M 163.59378,133.70947 V 73.810402 q 0,-18.78389 -15.51622,-18.78546 -15.51624,-0.002 -15.52409,18.78546 V 133.70947 H 102.06168 V 73.810402 q 0,-18.78389 -15.24589,-18.78546 -15.520944,0 -15.514659,18.78546 V 133.70947 H 40.809347 V 70.275552 q 0,-19.60433 13.612853,-29.67291 11.981383,-8.98722 32.398307,-8.99193 20.696693,0 30.491783,10.62025 8.43711,-10.62025 30.76841,-10.62025 20.41849,0 32.39516,8.99193 13.61128,10.05914 13.61285,29.67291 v 63.433918 z" class="cls-1" style="fill:#f27f22;stroke-width:.157174"/><path id="path18" d="m 100.03256,26.999222 30.2906,-22.1144027 -0.38978,-1.351697 C 75.293356,10.216166 50.428405,14.9644 3.356321,42.249822 l 0.435372,1.24168 3.7438889,0.0346 c -0.347355,3.77218 -0.943045,13.08318 -0.176035,27.08582 C 2.135078,85.728935 7.2259489,95.998695 12.005614,107.16435 12.76005,95.533465 12.681463,82.816502 9.1136099,70.156122 c -0.741862,-13.90519 -0.128882,-23.0543 0.205898,-26.61273 l 31.2069261,0.29863 c 0,0 -0.205898,9.43045 0.924184,18.29665 27.887406,9.79823 55.930422,-0.0346 70.808522,-24.18911 -4.12111,-4.63192 -12.22658,-10.95032 -12.22658,-10.95032 z" class="cls-2" style="fill:#333;stroke-width:.157174"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="720.878" height="492.005" viewBox="0 0 190.732 130.176"><path d="M163.594 133.71v-59.9q0-18.783-15.516-18.785T132.553 73.81v59.9h-30.491v-59.9q0-18.783-15.246-18.785-15.521 0-15.515 18.785v59.9H40.81V70.275q0-19.605 13.613-29.673 11.982-8.988 32.399-8.992 20.696 0 30.491 10.62 8.437-10.62 30.769-10.62 20.418 0 32.395 8.992 13.611 10.059 13.613 29.673v63.433z" class="cls-1" style="fill:#f27f22;stroke-width:.157174" transform="translate(-3.356 -3.533)"/><path d="m100.033 27 30.29-22.115-.39-1.352C75.293 10.216 50.428 14.964 3.356 42.25l.436 1.242 3.744.034c-.348 3.772-.943 13.083-.176 27.086-5.225 15.117-.134 25.387 4.646 36.552.754-11.63.675-24.347-2.892-37.008-.742-13.905-.13-23.054.206-26.613l31.206.299s-.205 9.43.925 18.297c27.887 9.798 55.93-.035 70.808-24.19C108.138 33.319 100.033 27 100.033 27" class="cls-2" style="fill:#333;stroke-width:.157174" transform="translate(-3.356 -3.533)"/></svg>

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 955 B