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:#8AB4F8;}
.st1{fill:#4285F4;}
.st2{fill:#246FDB;}
</style>
<g>
<polygon class="st0" points="300.5,491 211.7,404.4 402.5,209.5 494.5,299.6 "/>
<path class="st1" d="M300.9,107.9l-88.6-90.4L18.7,209.3c-25,25-25,65.4,0,90.4l190.7,192l90.2-84.4L154.3,254.5L300.9,107.9z"/>
<path class="st0" d="M493.3,210.7l-192-192c-25-25-65.5-25-90.5,0s-25,65.5,0,90.5l192,192c25,25,65.5,25,90.5,0
C518.2,276.3,518.2,235.7,493.3,210.7z"/>
<circle class="st2" cx="254.5" cy="449.5" r="62.5"/>
</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>.st0{fill:#8ab4f8}</style><path d="m300.5 491-88.8-86.6 190.8-194.9 92 90.1z" class="st0"/><path d="m300.9 107.9-88.6-90.4L18.7 209.3c-25 25-25 65.4 0 90.4l190.7 192 90.2-84.4-145.3-152.8z" style="fill:#4285f4"/><path d="m493.3 210.7-192-192c-25-25-65.5-25-90.5 0s-25 65.5 0 90.5l192 192c25 25 65.5 25 90.5 0 24.9-24.9 24.9-65.5 0-90.5" class="st0"/><circle cx="254.5" cy="449.5" r="62.5" style="fill:#246fdb"/></svg>

Before

Width:  |  Height:  |  Size: 894 B

After

Width:  |  Height:  |  Size: 546 B