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,6 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.0" preserveAspectRatio="xMidYMid meet" viewBox="36.13 36.34 440.71 440.63">
<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)" fill="#000000" stroke="none">
<path d="M2390 4754 c-732 -67 -1367 -469 -1736 -1101 -152 -261 -248 -557 -285 -883 -16 -146 -6 -432 20 -585 171 -973 943 -1706 1921 -1825 109 -13 401 -13 510 0 580 70 1111 366 1471 817 231 289 392 652 454 1023 22 131 31 448 16 580 -50 436 -215 832 -484 1165 -35 44 -118 132 -183 195 -331 321 -737 522 -1199 595 -97 15 -414 27 -505 19z m303 -231 c6 -9 -325 -2069 -333 -2076 -3 -3 -245 360 -539 805 -293 445 -532 810 -530 812 2 2 37 29 78 60 300 230 646 362 1051 400 73 6 269 6 273 -1z m382 -62 c128 -34 306 -101 299 -113 -3 -4 -18 -8 -33 -8 -86 0 -288 -82 -409 -166 l-63 -44 6 33 c3 17 14 88 25 157 27 168 28 170 48 170 9 0 67 -13 127 -29z m567 -356 c89 -18 234 -88 307 -148 351 -292 353 -834 3 -1122 -280 -232 -692 -220 -956 26 -119 111 -192 242 -222 397 -74 386 175 763 560 847 83 18 219 18 308 0z m-2379 -426 c76 -116 137 -212 135 -214 -1 -2 -30 2 -63 7 -78 13 -253 4 -335 -17 -36 -10 -103 -35 -149 -56 -46 -22 -86 -39 -88 -39 -9 0 108 212 158 288 72 107 183 242 198 242 4 0 68 -95 144 -211z m101 -449 c115 -29 189 -73 281 -165 131 -130 186 -259 186 -435 0 -177 -57 -318 -180 -440 -127 -126 -249 -176 -462 -188 l-126 -7 117 -420 c65 -231 127 -453 138 -492 12 -42 16 -73 10 -73 -19 0 -294 287 -351 367 -273 384 -401 797 -384 1237 6 160 24 229 85 331 96 160 239 257 437 299 55 11 178 4 249 -14z m3099 -127 c60 -205 82 -385 75 -621 -3 -95 -8 -175 -11 -178 -5 -6 -1939 16 -1945 21 -5 4 77 516 86 537 6 14 18 3 64 -55 137 -178 341 -306 560 -351 89 -18 275 -21 364 -5 199 35 378 132 524 285 114 119 212 294 235 417 4 20 11 37 15 37 4 0 19 -39 33 -87z m-2273 -828 c86 -130 135 -213 144 -248 35 -121 376 -1426 376 -1436 0 -14 -266 -15 -380 -1 -203 26 -420 88 -602 173 -73 34 -97 50 -101 68 -8 30 -255 918 -263 942 -4 12 0 17 13 17 10 0 61 15 115 33 254 88 448 287 530 543 18 57 34 104 36 104 1 0 61 -88 132 -195z m1238 -200 c5 -5 17 -573 23 -1055 l3 -234 -69 -33 c-126 -58 -429 -151 -439 -134 -5 8 -386 1455 -386 1466 0 9 860 -1 868 -10z m1050 -11 c8 -6 -63 -217 -107 -314 -94 -210 -217 -392 -381 -564 -90 -94 -280 -256 -301 -256 -5 0 -9 65 -9 158 0 197 -9 684 -15 859 l-5 133 408 -6 c224 -4 409 -8 410 -10z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="36.13 36.34 440.71 440.63"><path d="M239 36.6c-73.2 6.7-136.7 46.9-173.6 110.1-15.2 26.1-24.8 55.7-28.5 88.3-1.6 14.6-.6 43.2 2 58.5C56 390.8 133.2 464.1 231 476c10.9 1.3 40.1 1.3 51 0 58-7 111.1-36.6 147.1-81.7 23.1-28.9 39.2-65.2 45.4-102.3 2.2-13.1 3.1-44.8 1.6-58-5-43.6-21.5-83.2-48.4-116.5-3.5-4.4-11.8-13.2-18.3-19.5-33.1-32.1-73.7-52.2-119.9-59.5-9.7-1.5-41.4-2.7-50.5-1.9m30.3 23.1c.6.9-32.5 206.9-33.3 207.6-.3.3-24.5-36-53.9-80.5-29.3-44.5-53.2-81-53-81.2s3.7-2.9 7.8-6c30-23 64.6-36.2 105.1-40 7.3-.6 26.9-.6 27.3.1m38.2 6.2c12.8 3.4 30.6 10.1 29.9 11.3-.3.4-1.8.8-3.3.8-8.6 0-28.8 8.2-40.9 16.6l-6.3 4.4.6-3.3c.3-1.7 1.4-8.8 2.5-15.7 2.7-16.8 2.8-17 4.8-17 .9 0 6.7 1.3 12.7 2.9m56.7 35.6c8.9 1.8 23.4 8.8 30.7 14.8 35.1 29.2 35.3 83.4.3 112.2-28 23.2-69.2 22-95.6-2.6-11.9-11.1-19.2-24.2-22.2-39.7-7.4-38.6 17.5-76.3 56-84.7 8.3-1.8 21.9-1.8 30.8 0m-237.9 42.6c7.6 11.6 13.7 21.2 13.5 21.4-.1.2-3-.2-6.3-.7-7.8-1.3-25.3-.4-33.5 1.7-3.6 1-10.3 3.5-14.9 5.6-4.6 2.2-8.6 3.9-8.8 3.9-.9 0 10.8-21.2 15.8-28.8 7.2-10.7 18.3-24.2 19.8-24.2.4 0 6.8 9.5 14.4 21.1m10.1 44.9c11.5 2.9 18.9 7.3 28.1 16.5 13.1 13 18.6 25.9 18.6 43.5 0 17.7-5.7 31.8-18 44-12.7 12.6-24.9 17.6-46.2 18.8l-12.6.7 11.7 42c6.5 23.1 12.7 45.3 13.8 49.2 1.2 4.2 1.6 7.3 1 7.3-1.9 0-29.4-28.7-35.1-36.7-27.3-38.4-40.1-79.7-38.4-123.7.6-16 2.4-22.9 8.5-33.1 9.6-16 23.9-25.7 43.7-29.9 5.5-1.1 17.8-.4 24.9 1.4m309.9 12.7c6 20.5 8.2 38.5 7.5 62.1-.3 9.5-.8 17.5-1.1 17.8-.5.6-193.9-1.6-194.5-2.1-.5-.4 7.7-51.6 8.6-53.7.6-1.4 1.8-.3 6.4 5.5 13.7 17.8 34.1 30.6 56 35.1 8.9 1.8 27.5 2.1 36.4.5 19.9-3.5 37.8-13.2 52.4-28.5 11.4-11.9 21.2-29.4 23.5-41.7.4-2 1.1-3.7 1.5-3.7s1.9 3.9 3.3 8.7M219 284.5c8.6 13 13.5 21.3 14.4 24.8 3.5 12.1 37.6 142.6 37.6 143.6 0 1.4-26.6 1.5-38 .1-20.3-2.6-42-8.8-60.2-17.3-7.3-3.4-9.7-5-10.1-6.8-.8-3-25.5-91.8-26.3-94.2-.4-1.2 0-1.7 1.3-1.7 1 0 6.1-1.5 11.5-3.3 25.4-8.8 44.8-28.7 53-54.3 1.8-5.7 3.4-10.4 3.6-10.4.1 0 6.1 8.8 13.2 19.5m123.8 20c.5.5 1.7 57.3 2.3 105.5l.3 23.4-6.9 3.3c-12.6 5.8-42.9 15.1-43.9 13.4-.5-.8-38.6-145.5-38.6-146.6 0-.9 86 .1 86.8 1m105 1.1c.8.6-6.3 21.7-10.7 31.4-9.4 21-21.7 39.2-38.1 56.4-9 9.4-28 25.6-30.1 25.6-.5 0-.9-6.5-.9-15.8 0-19.7-.9-68.4-1.5-85.9L366 304l40.8.6c22.4.4 40.9.8 41 1"/></svg>

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB