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:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 193 193" style="enable-background:new 0 0 193 193" xml:space="preserve"><style type="text/css">.st0{fill:#38a2ff}</style><path d="M122.2,50.2c5.6-5.6,14.8-5.6,20.4,0c5.6,5.6,5.6,14.8,0,20.4c-3.3,3.3-7.7,4.7-12.2,4.1c-0.2,0-0.4,0-0.7,0 c-1.3-0.2-2.7,0-4.1,0.6c-1.9,0.9-3.2,2.4-3.9,4.2c-0.7,1.8-0.6,3.8,0.2,5.6c4.8,10.4,2.6,23-5.6,31.1c-8.2,8.2-20.7,10.4-31.1,5.6 c-1.9-0.9-3.9-0.9-5.7-0.2c-1.8,0.7-3.3,2-4.1,3.8c-0.5,1.2-0.8,2.4-0.7,3.7c0,0.2,0,0.5,0,0.7c0.8,4.6-0.8,9.3-4,12.6 c-5.6,5.6-14.8,5.6-20.4,0c-2.7-2.7-4.2-6.3-4.2-10.2c0-3.8,1.5-7.5,4.2-10.2c3.3-3.3,7.7-4.7,12.2-4.1c0.1,0,0.1,0,0.2,0 c0.5,0.1,1,0.2,1.5,0.2c1.1,0,2.1-0.2,3.1-0.7c1.9-0.9,3.2-2.4,3.8-4.1c0.7-1.8,0.7-3.9-0.2-5.8c-4.8-10.5-2.6-23,5.6-31.1 c8.2-8.2,20.7-10.4,31.1-5.6c1.8,0.9,3.9,0.9,5.7,0.2c1.8-0.7,3.3-2,4.2-3.8c0.7-1.4,0.8-3,0.6-4.5v0 C117.4,58.2,118.9,53.5,122.2,50.2z M107.9,107.8c6.2-6.2,6.2-16.3,0-22.6c-6.2-6.2-16.3-6.2-22.6,0c-6.2,6.2-6.2,16.3,0,22.6 C91.6,114,101.7,114,107.9,107.8z M96.5,0C149.8,0,193,43.2,193,96.5c0,53.3-43.2,96.5-96.5,96.5S0,149.8,0,96.5 C0,43.2,43.2,0,96.5,0z M147.9,76c8.5-8.5,8.5-22.3,0-30.9c-8.5-8.5-22.3-8.5-30.9,0c-3.2,3.2-5.1,7.1-6,11.1 c-15.5-5.8-33.2-2.1-45,9.7C54.2,77.7,50.5,95.5,56.4,111c-4.1,0.8-8,2.8-11.2,6c-8.5,8.5-8.5,22.3,0,30.9c8.5,8.5,22.3,8.5,30.9,0 c3.2-3.2,5.2-7.2,6-11.3c4.8,1.8,9.8,2.7,14.8,2.7c11.1,0,22-4.3,30.1-12.4c11.8-11.8,15.5-29.4,9.8-44.8 C140.8,81.1,144.7,79.1,147.9,76z" class="st0"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 193 193"><path d="M122.2 50.2c5.6-5.6 14.8-5.6 20.4 0s5.6 14.8 0 20.4c-3.3 3.3-7.7 4.7-12.2 4.1h-.7c-1.3-.2-2.7 0-4.1.6-1.9.9-3.2 2.4-3.9 4.2s-.6 3.8.2 5.6c4.8 10.4 2.6 23-5.6 31.1-8.2 8.2-20.7 10.4-31.1 5.6-1.9-.9-3.9-.9-5.7-.2s-3.3 2-4.1 3.8c-.5 1.2-.8 2.4-.7 3.7v.7c.8 4.6-.8 9.3-4 12.6-5.6 5.6-14.8 5.6-20.4 0-2.7-2.7-4.2-6.3-4.2-10.2 0-3.8 1.5-7.5 4.2-10.2 3.3-3.3 7.7-4.7 12.2-4.1h.2c.5.1 1 .2 1.5.2 1.1 0 2.1-.2 3.1-.7 1.9-.9 3.2-2.4 3.8-4.1.7-1.8.7-3.9-.2-5.8-4.8-10.5-2.6-23 5.6-31.1 8.2-8.2 20.7-10.4 31.1-5.6 1.8.9 3.9.9 5.7.2s3.3-2 4.2-3.8c.7-1.4.8-3 .6-4.5-.7-4.5.8-9.2 4.1-12.5m-14.3 57.6c6.2-6.2 6.2-16.3 0-22.6-6.2-6.2-16.3-6.2-22.6 0-6.2 6.2-6.2 16.3 0 22.6 6.3 6.2 16.4 6.2 22.6 0M96.5 0C149.8 0 193 43.2 193 96.5S149.8 193 96.5 193 0 149.8 0 96.5 43.2 0 96.5 0m51.4 76c8.5-8.5 8.5-22.3 0-30.9-8.5-8.5-22.3-8.5-30.9 0-3.2 3.2-5.1 7.1-6 11.1-15.5-5.8-33.2-2.1-45 9.7S50.5 95.5 56.4 111c-4.1.8-8 2.8-11.2 6-8.5 8.5-8.5 22.3 0 30.9 8.5 8.5 22.3 8.5 30.9 0 3.2-3.2 5.2-7.2 6-11.3 4.8 1.8 9.8 2.7 14.8 2.7 11.1 0 22-4.3 30.1-12.4 11.8-11.8 15.5-29.4 9.8-44.8 4-1 7.9-3 11.1-6.1" style="fill:#38a2ff"/></svg>

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB