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="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:#147EFB;}
.st1{fill:#FC3158;}
</style>
<g>
<path class="st0" d="M286,512c124.4,0,226-101.6,226-226c0-124.1-101.4-225-226-225c-8.3,0-15,6.7-15,15v195H76
c-8.3,0-15,6.7-15,15C61,410.6,161.9,512,286,512z"/>
<path class="st1" d="M15,0h211c8.3,0,15,6.7,15,15v211c0,8.3-6.7,15-15,15C101.6,241,0,139.4,0,15C0,6.7,6.7,0,15,0z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><path d="M286 512c124.4 0 226-101.6 226-226 0-124.1-101.4-225-226-225-8.3 0-15 6.7-15 15v195H76c-8.3 0-15 6.7-15 15 0 124.6 100.9 226 225 226" style="fill:#147efb"/><path d="M15 0h211c8.3 0 15 6.7 15 15v211c0 8.3-6.7 15-15 15C101.6 241 0 139.4 0 15 0 6.7 6.7 0 15 0" style="fill:#fc3158"/></svg>

Before

Width:  |  Height:  |  Size: 736 B

After

Width:  |  Height:  |  Size: 378 B