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,5 +1 @@
<svg xmlns:serif="http://www.serif.com/" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" style="enable-background:new 0 0 512 512;" xml:space="preserve" viewBox="0.01 76.52 512 358.88">
<g id="path2" transform="matrix(0.264585,0,0,0.264585,-50.0005,-50.0001)">
<path d="M425.1,478.4c-27.5-0.1-54.8,4.7-80.7,14.1c-45.8,16.1-83.5,45.1-113,86.8c-28.3,40.4-42.4,85.4-42.4,135.2v884 c0,64.6,22.9,120.4,68.6,167.5c47.1,45.8,103,68.6,167.5,68.6c66,0,121.8-22.9,167.5-68.6c47.1-47.1,70.6-103,70.6-167.6v-160.7 c0.5-34.8,36.4-25.7,54.5,0c33.9,58.8,105.9,109.3,189.7,109v0c83.8-0.3,153.4-41.7,189.7-109c13.8-16.2,52.5-43.9,56.5,0v160.7 c0,64.6,22.9,120.4,68.6,167.5c47.2,45.8,103,68.6,167.5,68.6c65.9,0,121.8-22.9,167.5-68.6c47.1-47.1,70.6-103,70.6-167.6v-884 c0-49.8-14.8-94.8-44.4-135.2c-28.3-41.8-65.3-70.7-111-86.8c-26.9-9.4-53.8-14.1-80.7-14.1c-72.7,0-133.9,28.3-183.7,84.8 L968.5,843.6c-5.4,4.1-23.2,34.9-61.1,34.9c-37.8,0-53.6-30.8-59-34.8L606.7,563.2C558.3,506.7,497.8,478.4,425.1,478.4z M1918.3,478.5c-56.5,0-105,20.2-145.3,60.5c-39,39-58.5,86.8-58.5,143.3c0,56.5,19.5,105,58.5,145.3c40.3,39,88.8,58.5,145.3,58.5 c56.5,0,104.9-19.5,145.3-58.5c40.3-40.3,60.5-88.8,60.5-145.3c0-56.5-20.2-104.3-60.5-143.3 C2023.2,498.7,1974.8,478.5,1918.3,478.5z M1920.2,926.5c-56.5,0-105,20.2-145.3,60.5c-40.3,40.4-60.5,88.8-60.5,145.3v498.5 c0,56.5,20.2,105,60.5,145.3c40.4,39,88.8,58.5,145.3,58.5c56.5,0,104.3-19.5,143.3-58.5c40.3-40.3,60.5-88.8,60.5-145.3v-498.5 c0-56.5-20.2-105-60.5-145.3C2024.5,946.7,1976.8,926.5,1920.2,926.5z" fill="#ffffff"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0.01 76.52 512 358.88"><path fill="#fff" d="M62.475 76.577a61.9 61.9 0 0 0-21.352 3.731c-12.118 4.26-22.093 11.933-29.899 22.966C3.737 113.964.006 125.87.006 139.046v233.893c0 17.092 6.06 31.856 18.15 44.318 12.463 12.118 27.253 18.15 44.319 18.15 17.462 0 32.226-6.058 44.318-18.15 12.462-12.462 18.68-27.252 18.68-44.344v-42.52c.132-9.207 9.63-6.8 14.42 0 8.969 15.558 28.019 28.92 50.19 28.84 22.173-.079 40.588-11.033 50.193-28.84 3.651-4.286 13.89-11.615 14.949 0v42.52c0 17.092 6.059 31.856 18.15 44.318 12.489 12.118 27.253 18.15 44.318 18.15 17.436 0 32.227-6.059 44.318-18.15 12.462-12.462 18.68-27.253 18.68-44.345V138.993c0-13.176-3.916-25.083-11.748-35.772-7.487-11.06-17.277-18.706-29.369-22.966q-10.675-3.73-21.352-3.73c-19.235 0-35.427 7.487-48.604 22.436l-63.368 74.243c-1.429 1.085-6.138 9.234-16.166 9.234-10.001 0-14.182-8.15-15.61-9.208l-63.95-74.216C97.716 84.065 81.71 76.577 62.473 76.577m395.078.027c-14.95 0-27.782 5.344-38.444 16.007-10.32 10.319-15.479 22.966-15.479 37.915 0 14.95 5.16 27.782 15.479 38.444 10.662 10.32 23.495 15.479 38.444 15.479s27.755-5.16 38.444-15.479c10.663-10.662 16.007-23.495 16.007-38.444s-5.344-27.596-16.007-37.915c-10.69-10.663-23.495-16.007-38.444-16.007m.503 118.534c-14.95 0-27.782 5.345-38.445 16.007-10.662 10.69-16.007 23.495-16.007 38.444v131.896c0 14.95 5.345 27.782 16.007 38.444 10.69 10.32 23.496 15.479 38.445 15.479s27.596-5.16 37.915-15.479c10.662-10.662 16.007-23.495 16.007-38.444V249.59c0-14.949-5.345-27.78-16.007-38.444-10.32-10.662-22.94-16.007-37.915-16.007"/></svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB