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,10 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" 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:#ffffff;}
.st1{fill:#000000;}
</style>
<g>
<path class="st0" d="M512,256c0,141.4-114.6,256-256,256C114.6,512,0,397.4,0,256C0,114.6,114.6,0,256,0C397.4,0,512,114.6,512,256 " fill="#000000"/>
<path class="st1" d="M260.3,156.4l66.2,163.5l-100.1-78.8L260.3,156.4L260.3,156.4z M378,357.6L276.1,112.3 c-2.9-7.1-8.7-10.8-15.8-10.8c-7.1,0-13.3,3.7-16.2,10.8l-111.8,269h38.3l44.3-110.9l132.1,106.7c5.3,4.3,9.1,6.2,14.1,6.2 c10,0,18.7-7.5,18.7-18.3C379.7,363.3,379.1,360.6,378,357.6L378,357.6z" fill="#000000"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><path d="M512 256c0 141.4-114.6 256-256 256S0 397.4 0 256 114.6 0 256 0s256 114.6 256 256" style="fill:#fff"/><path d="m260.3 156.4 66.2 163.5-100.1-78.8zM378 357.6 276.1 112.3c-2.9-7.1-8.7-10.8-15.8-10.8s-13.3 3.7-16.2 10.8l-111.8 269h38.3l44.3-110.9L347 377.1c5.3 4.3 9.1 6.2 14.1 6.2 10 0 18.7-7.5 18.7-18.3-.1-1.7-.7-4.4-1.8-7.4" style="fill:#000"/></svg>

Before

Width:  |  Height:  |  Size: 770 B

After

Width:  |  Height:  |  Size: 442 B