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,18 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.0" preserveAspectRatio="xMidYMid meet" viewBox="16 1.28 368.2 398.63">
<metadata fill="#ffffff">
Created by potrace 1.11, written by Peter Selinger 2001-2013
</metadata>
<g transform="translate(0.000000,400.000000) scale(0.100000,-0.100000)" fill="#ffffff" stroke="none">
<path d="M920 3977 c-52 -17 -116 -86 -133 -144 -11 -40 -13 -340 -12 -1853 1 -1731 1 -1807 19 -1843 10 -21 34 -53 53 -72 68 -68 23 -66 1180 -63 l1040 3 49 30 c30 19 60 49 79 79 l30 49 3 1810 c1 1193 -1 1822 -8 1847 -14 53 -48 99 -99 135 l-43 30 -1061 2 c-761 1 -1072 -2 -1097 -10z" fill="#ffffff"/>
<path d="M325 3364 c-7 -8 -12 -25 -11 -39 3 -24 2 -25 -63 -25 -39 0 -72 -5 -79 -12 -16 -16 -15 -113 1 -126 7 -6 41 -12 76 -14 62 -3 64 -4 67 -32 2 -16 9 -33 16 -37 7 -4 74 -7 150 -7 l138 1 0 152 0 152 -140 0 c-107 1 -144 -3 -155 -13z" fill="#ffffff"/>
<path d="M3386 3371 c-2 -5 0 -277 3 -293 2 -10 264 -7 284 4 10 5 17 20 17 38 l0 30 69 0 c41 0 73 5 77 11 11 19 5 122 -8 131 -7 4 -41 8 -75 8 l-63 0 0 30 c0 18 -7 33 -17 38 -20 10 -282 13 -287 3z" fill="#ffffff"/>
<path d="M373 2762 c-32 -2 -53 -8 -54 -15 -1 -7 -1 -22 -2 -34 0 -13 -5 -23 -11 -24 -6 0 -36 -2 -66 -3 -31 -1 -61 -5 -68 -10 -7 -4 -12 -30 -12 -67 0 -69 2 -71 92 -73 59 -2 62 -3 63 -27 3 -47 8 -49 161 -49 l144 0 0 150 c0 83 -3 150 -7 150 -45 3 -199 4 -240 2z" fill="#ffffff"/>
<path d="M3386 2760 c-1 -3 -2 -70 -2 -150 l1 -145 139 -3 c150 -3 166 2 166 47 0 27 1 27 65 28 36 0 71 5 77 11 14 14 11 113 -3 127 -6 6 -36 11 -67 12 -31 0 -60 1 -64 2 -5 1 -8 11 -8 24 0 46 -9 49 -160 50 -78 1 -143 0 -144 -3z" fill="#ffffff"/>
<path d="M331 2141 c-8 -5 -15 -22 -15 -38 -2 -28 -3 -28 -71 -31 -40 -2 -73 -8 -77 -15 -12 -19 -9 -112 4 -125 7 -7 40 -12 79 -12 65 0 67 -1 64 -22 -9 -48 3 -52 157 -52 l143 -1 3 153 3 152 -138 0 c-76 0 -144 -4 -152 -9z" fill="#ffffff"/>
<path d="M3385 2000 c0 -126 2 -150 15 -151 63 -6 258 -3 273 3 10 6 17 20 17 38 l0 30 63 0 c34 0 68 4 75 9 9 5 12 27 10 72 l-3 64 -72 3 c-72 3 -73 3 -73 30 0 48 -13 52 -165 52 l-140 0 0 -150z" fill="#ffffff"/>
<path d="M337 1532 c-17 -3 -18 -6 -21 -39 -2 -33 -14 -39 -66 -36 -74 5 -90 -7 -90 -67 0 -77 3 -80 81 -80 38 0 69 -3 70 -7 7 -74 5 -73 164 -73 l146 0 -3 152 -3 152 -131 0 c-72 1 -138 0 -147 -2z" fill="#ffffff"/>
<path d="M3405 1532 c-20 -3 -20 -10 -20 -152 l0 -150 140 0 c152 0 165 4 165 52 0 27 1 27 73 30 l72 3 5 53 c8 74 -7 93 -68 91 -77 -2 -82 -1 -82 24 0 46 -10 49 -141 51 -68 0 -133 0 -144 -2z" fill="#ffffff"/>
<path d="M323 908 c-4 -7 -7 -24 -8 -38 0 -24 -3 -25 -69 -26 -46 -1 -71 -6 -77 -15 -13 -21 -11 -113 3 -127 7 -7 40 -12 78 -12 l67 0 0 -30 c0 -17 2 -33 6 -36 3 -3 71 -7 151 -7 l146 -2 0 153 0 152 -144 0 c-105 0 -147 -3 -153 -12z" fill="#ffffff"/>
<path d="M3385 770 c0 -126 2 -150 15 -151 8 -1 73 -1 144 -1 136 0 146 3 146 50 0 20 4 22 64 22 40 0 68 5 75 13 14 18 17 115 3 129 -6 6 -40 10 -76 10 -65 0 -66 0 -66 27 0 47 -13 51 -165 51 l-140 0 0 -150z" fill="#ffffff"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="16 1.28 368.2 398.63"><g fill="#fff"><path d="M92 2.3C86.8 4 80.4 10.9 78.7 16.7c-1.1 4-1.3 34-1.2 185.3.1 173.1.1 180.7 1.9 184.3 1 2.1 3.4 5.3 5.3 7.2 6.8 6.8 2.3 6.6 118 6.3l104-.3 4.9-3c3-1.9 6-4.9 7.9-7.9l3-4.9.3-181c.1-119.3-.1-182.2-.8-184.7-1.4-5.3-4.8-9.9-9.9-13.5l-4.3-3-106.1-.2c-76.1-.1-107.2.2-109.7 1M32.5 63.6c-.7.8-1.2 2.5-1.1 3.9.3 2.4.2 2.5-6.3 2.5-3.9 0-7.2.5-7.9 1.2-1.6 1.6-1.5 11.3.1 12.6.7.6 4.1 1.2 7.6 1.4 6.2.3 6.4.4 6.7 3.2.2 1.6.9 3.3 1.6 3.7s7.4.7 15 .7l13.8-.1V62.3H48c-10.7-.1-14.4.3-15.5 1.3M338.6 62.9c-.2.5 0 27.7.3 29.3.2 1 26.4.7 28.4-.4 1-.5 1.7-2 1.7-3.8v-3h6.9c4.1 0 7.3-.5 7.7-1.1 1.1-1.9.5-12.2-.8-13.1-.7-.4-4.1-.8-7.5-.8H369v-3c0-1.8-.7-3.3-1.7-3.8-2-1-28.2-1.3-28.7-.3M37.3 123.8c-3.2.2-5.3.8-5.4 1.5s-.1 2.2-.2 3.4c0 1.3-.5 2.3-1.1 2.4-.6 0-3.6.2-6.6.3-3.1.1-6.1.5-6.8 1-.7.4-1.2 3-1.2 6.7 0 6.9.2 7.1 9.2 7.3 5.9.2 6.2.3 6.3 2.7.3 4.7.8 4.9 16.1 4.9H62v-15c0-8.3-.3-15-.7-15-4.5-.3-19.9-.4-24-.2M338.6 124c-.1.3-.2 7-.2 15l.1 14.5 13.9.3c15 .3 16.6-.2 16.6-4.7 0-2.7.1-2.7 6.5-2.8 3.6 0 7.1-.5 7.7-1.1 1.4-1.4 1.1-11.3-.3-12.7-.6-.6-3.6-1.1-6.7-1.2-3.1 0-6-.1-6.4-.2-.5-.1-.8-1.1-.8-2.4 0-4.6-.9-4.9-16-5-7.8-.1-14.3 0-14.4.3M33.1 185.9c-.8.5-1.5 2.2-1.5 3.8-.2 2.8-.3 2.8-7.1 3.1-4 .2-7.3.8-7.7 1.5-1.2 1.9-.9 11.2.4 12.5.7.7 4 1.2 7.9 1.2 6.5 0 6.7.1 6.4 2.2-.9 4.8.3 5.2 15.7 5.2l14.3.1.3-15.3.3-15.2H48.3c-7.6 0-14.4.4-15.2.9M338.5 200c0 12.6.2 15 1.5 15.1 6.3.6 25.8.3 27.3-.3 1-.6 1.7-2 1.7-3.8v-3h6.3c3.4 0 6.8-.4 7.5-.9.9-.5 1.2-2.7 1-7.2l-.3-6.4-7.2-.3c-7.2-.3-7.3-.3-7.3-3 0-4.8-1.3-5.2-16.5-5.2h-14zM33.7 246.8c-1.7.3-1.8.6-2.1 3.9-.2 3.3-1.4 3.9-6.6 3.6-7.4-.5-9 .7-9 6.7 0 7.7.3 8 8.1 8 3.8 0 6.9.3 7 .7.7 7.4.5 7.3 16.4 7.3h14.6l-.3-15.2-.3-15.2H48.4c-7.2-.1-13.8 0-14.7.2M340.5 246.8c-2 .3-2 1-2 15.2v15h14c15.2 0 16.5-.4 16.5-5.2 0-2.7.1-2.7 7.3-3l7.2-.3.5-5.3c.8-7.4-.7-9.3-6.8-9.1-7.7.2-8.2.1-8.2-2.4 0-4.6-1-4.9-14.1-5.1-6.8 0-13.3 0-14.4.2M32.3 309.2c-.4.7-.7 2.4-.8 3.8 0 2.4-.3 2.5-6.9 2.6-4.6.1-7.1.6-7.7 1.5-1.3 2.1-1.1 11.3.3 12.7.7.7 4 1.2 7.8 1.2h6.7v3c0 1.7.2 3.3.6 3.6.3.3 7.1.7 15.1.7l14.6.2V308H47.6c-10.5 0-14.7.3-15.3 1.2M338.5 323c0 12.6.2 15 1.5 15.1.8.1 7.3.1 14.4.1 13.6 0 14.6-.3 14.6-5 0-2 .4-2.2 6.4-2.2 4 0 6.8-.5 7.5-1.3 1.4-1.8 1.7-11.5.3-12.9-.6-.6-4-1-7.6-1-6.5 0-6.6 0-6.6-2.7 0-4.7-1.3-5.1-16.5-5.1h-14z"/></g></svg>

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB