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,14 +1 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.7.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Logos" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFCF25;}
</style>
<g>
<path class="st0" d="M0,7.7l255,496.6L512,7.7H0z M215.6,205h-40.4v-40.4h40.4C215.6,164.6,215.6,205,215.6,205z M215.6,144.4
h-40.4v-40.4h40.4C215.6,103.9,215.6,144.4,215.6,144.4z M276.2,265.6h-40.4v-40.4h40.4V265.6z M276.2,205h-40.4v-40.4h40.4V205z
M276.2,144.4h-40.4v-40.4h40.4C276.2,103.9,276.2,144.4,276.2,144.4z M336.8,205h-40.4v-40.4h40.4V205z M296.4,144.4v-40.4h40.4
v40.4C336.8,144.4,296.4,144.4,296.4,144.4z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><path d="m0 7.7 255 496.6L512 7.7zM215.6 205h-40.4v-40.4h40.4zm0-60.6h-40.4V104h40.4zm60.6 121.2h-40.4v-40.4h40.4zm0-60.6h-40.4v-40.4h40.4zm0-60.6h-40.4V104h40.4zm60.6 60.6h-40.4v-40.4h40.4zm-40.4-60.6V104h40.4v40.4z" style="fill:#ffcf25"/></svg>

Before

Width:  |  Height:  |  Size: 857 B

After

Width:  |  Height:  |  Size: 329 B