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" viewBox="0 56.7 497.61 384.2"><radialGradient id="a" cx="245.802" cy="466.282" r="34.492" gradientTransform="matrix(-7.2244231 7.2244502 -7.2148432 -7.214843 5889.8349 159.99681)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#61a6ed"/><stop offset="1" stop-color="#257edb"/></radialGradient><path fill="url(#a)" d="m540.34375-1478.785c-12.29432.3444-23.16875 4.1084-30.1875 12.1562-21.94041 25.1615 2.21091 48.5609 10.59375 80.375 11.19324 42.4518-1.53635 87.6244 32.4375 117.3438 11.70123 10.2333 25.83068 12.9293 39.40625 14.1875-17.84802 21.0296-28.60932 50.1918-22.75 80.1562 10.25567 52.4474 62.09821 87.3643 113.5 78.5938 29.32083-5.0046 52.91321-22.9697 65.75-47.5.46733-.8094 1.56181-.8131 2.03125 0 12.83808 24.5246 36.43356 42.4961 65.75 47.5 51.4018 8.7705 103.02552-26.1464 113.28125-78.5938 5.85926-29.9644-4.68318-59.1266-22.53125-80.1562 13.57556-1.2582 27.48621-3.9542 39.1875-14.1875 33.97384-29.7194 21.24426-74.892 32.4375-117.3438 8.38284-31.8141 32.5029-55.2135 10.5625-80.375-7.01869-8.0478-17.64318-11.8117-29.9375-12.1562-27.05023-.7631-55.22868 10.0899-83.78125 23.625s-60.05514 36.7754-79.875 61.6562l73.15625 42.5-115.71875 67.1875-10.125 127.4688-2.625-133.3438-13.6875-7.9375-10.0625 126.3125-2.625-133.6875-13.71875-7.9687-10.03125 126.7188-2.6875-134.0938-13.625-7.9062-10.09375 127.0312-2.65625-134.4687-13.59375-7.875-10.125 127.4062-2.65625-134.8437 70.0625-40.6875c-20.05589-25.7166-52.77139-49.9356-81.28125-63.4688s-56.21174-24.2288-83.78125-23.625z" transform="translate(-501.18383 1535.527451)"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 56.7 497.61 384.2"><radialGradient id="a" cx="245.802" cy="466.282" r="34.492" gradientTransform="matrix(-7.22442 7.22445 -7.21484 -7.21484 5889.835 159.997)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#61a6ed"/><stop offset="1" stop-color="#257edb"/></radialGradient><path fill="url(#a)" d="M540.344-1478.785c-12.295.344-23.169 4.108-30.188 12.156-21.94 25.162 2.211 48.561 10.594 80.375 11.193 42.452-1.536 87.625 32.438 117.344 11.7 10.233 25.83 12.93 39.406 14.188-17.848 21.03-28.61 50.191-22.75 80.156 10.255 52.447 62.098 87.364 113.5 78.593 29.32-5.004 52.913-22.97 65.75-47.5.467-.809 1.562-.813 2.031 0 12.838 24.525 36.434 42.497 65.75 47.5 51.402 8.771 103.026-26.146 113.281-78.593 5.86-29.965-4.683-59.127-22.531-80.157 13.576-1.258 27.486-3.954 39.188-14.187 33.973-29.72 21.244-74.892 32.437-117.344 8.383-31.814 32.503-55.213 10.563-80.375-7.02-8.048-17.644-11.812-29.938-12.156-27.05-.763-55.229 10.09-83.781 23.625s-60.055 36.775-79.875 61.656l73.156 42.5-115.719 67.188-10.125 127.468-2.625-133.343-13.687-7.938-10.063 126.313-2.625-133.688-13.718-7.969-10.032 126.72-2.687-134.094-13.625-7.907-10.094 127.032-2.656-134.47-13.594-7.874L638-1216.16l-2.656-134.844 70.062-40.687c-20.056-25.717-52.771-49.936-81.281-63.469s-56.212-24.229-83.781-23.625" transform="translate(-501.184 1535.527)"/></svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB