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,17 +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="Layer_1" 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:#FFD600;}
.st1{fill:#27B1FF;}
.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFD600;}
</style>
<g>
<rect x="304" y="240" class="st0" width="208" height="32"/>
<path class="st1" d="M53.6,51.9l91.7,193.7L0,465.3L217.9,512l60.5-265.6V0L53.6,51.9z"/>
<path class="st2" d="M224,320c53,0,96-28.7,96-64s-43-64-96-64s-96,28.7-96,64S171,320,224,320z M216,256c39.8,0,72-10.7,72-24
s-32.2-24-72-24s-72,10.7-72,24S176.2,256,216,256z"/>
<path class="st1" d="M145.3,243.9L119.4,192l159.1-27.7v79.6H145.3z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 512 512"><style>.st1{fill:#27b1ff}</style><path d="M304 240h208v32H304z" style="fill:#ffd600"/><path d="m53.6 51.9 91.7 193.7L0 465.3 217.9 512l60.5-265.6V0z" class="st1"/><path d="M224 320c53 0 96-28.7 96-64s-43-64-96-64-96 28.7-96 64 43 64 96 64m-8-64c39.8 0 72-10.7 72-24s-32.2-24-72-24-72 10.7-72 24 32.2 24 72 24" style="fill-rule:evenodd;clip-rule:evenodd;fill:#ffd600"/><path d="M145.3 243.9 119.4 192l159.1-27.7v79.6z" class="st1"/></svg>

Before

Width:  |  Height:  |  Size: 915 B

After

Width:  |  Height:  |  Size: 559 B