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" width="400" height="400" version="1.1"><g stroke-linecap="round" stroke-width="48.5"><path stroke="#0066d9" d="m24.26 186.32v27.351"/><path stroke="#4285f4" d="m375.74 186.32v27.351"/><path stroke="#ea4335" d="m112.13 104.27v89.46m0 74.645v27.351"/><path stroke="#34a853" d="m287.87 206.26v89.46m0-191.46v27.351"/><path stroke="#fab908" d="m200 127.06v145.87m0-248.68v27.351m0 296.78v27.351"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="400" height="400"><g stroke-linecap="round" stroke-width="48.5"><path stroke="#0066d9" d="M24.26 186.32v27.351"/><path stroke="#4285f4" d="M375.74 186.32v27.351"/><path stroke="#ea4335" d="M112.13 104.27v89.46m0 74.645v27.351"/><path stroke="#34a853" d="M287.87 206.26v89.46m0-191.46v27.351"/><path stroke="#fab908" d="M200 127.06v145.87m0-248.68v27.351m0 296.78v27.351"/></g></svg>

Before

Width:  |  Height:  |  Size: 443 B

After

Width:  |  Height:  |  Size: 429 B