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" viewBox="0 0 384 320"><path d="m64 288h-32v-256h32v-32h-64v320h64zm0 0"/><path d="m320 32h32v256h-32v32h64v-320h-64zm0 0"/><path d="m80 64h32v32h-32zm0 0"/><path d="m176 64h32v32h-32zm0 0"/><path d="m272 64h32v32h-32zm0 0"/><path d="m80 144h32v32h-32zm0 0"/><path d="m176 144h32v32h-32zm0 0"/><path d="m272 144h32v32h-32zm0 0"/><path d="m80 224h32v32h-32zm0 0"/><path d="m176 224h32v32h-32zm0 0"/><path d="m272 224h32v32h-32zm0 0"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 320"><path d="M64 288H32V32h32V0H0v320h64zM320 32h32v256h-32v32h64V0h-64zM80 64h32v32H80zM176 64h32v32h-32zM272 64h32v32h-32zM80 144h32v32H80zM176 144h32v32h-32zM272 144h32v32h-32zM80 224h32v32H80zM176 224h32v32h-32zM272 224h32v32h-32zm0 0"/></svg>

Before

Width:  |  Height:  |  Size: 478 B

After

Width:  |  Height:  |  Size: 305 B