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,16 +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-rule:evenodd;clip-rule:evenodd;fill:#5856E0;}
.st1{fill:none;stroke:#FFFFFF;stroke-width:31.25;stroke-linejoin:round;stroke-miterlimit:1.5;}
</style>
<g>
<circle class="st0" cx="256" cy="256" r="256"/>
<g>
<path class="st1" d="M249.3,91.7L88.5,252.5c0,0-55.3,54,4.8,115.8c60.4,62,115.8,4.8,115.8,4.8l160.8-160.8"/>
<path class="st1" d="M266.1,421.7l160.2-161.3c0,0,55.1-54.2-5.3-115.8c-60.6-61.8-115.8-4.4-115.8-4.4L145.1,301.5"/>
</g>
</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:none;stroke:#fff;stroke-width:31.25;stroke-linejoin:round;stroke-miterlimit:1.5}</style><circle cx="256" cy="256" r="256" style="fill-rule:evenodd;clip-rule:evenodd;fill:#5856e0"/><path d="M249.3 91.7 88.5 252.5s-55.3 54 4.8 115.8c60.4 62 115.8 4.8 115.8 4.8l160.8-160.8" class="st1"/><path d="m266.1 421.7 160.2-161.3s55.1-54.2-5.3-115.8c-60.6-61.8-115.8-4.4-115.8-4.4L145.1 301.5" class="st1"/></svg>

Before

Width:  |  Height:  |  Size: 856 B

After

Width:  |  Height:  |  Size: 541 B