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,20 +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:#0067B9;}
.st1{fill:#69B3E7;}
.st2{fill:#FFC107;}
.st3{fill:#333E48;}
</style>
<g>
<path class="st0" d="M53.8,256c0-111.7,90.5-202.2,202.2-202.2c70.2,0,132,35.7,168.2,90l39.7,7.8l5-37.7C423,45.3,344.8,0,256,0
C114.7,0,0,114.7,0,256c0,52.6,15.8,101.3,43,142.1l38.5,5l6.3-35C66.4,336,53.8,297.5,53.8,256z"/>
<path class="st1" d="M469.5,114.9c-0.3-0.3-0.5-0.5-0.8-1L424,143.8c0.3,0.3,0.5,0.5,0.8,1c21.1,31.9,33.4,70.2,33.4,111.2
c0,111.7-90.5,202.2-202.2,202.2c-69.7,0-131.3-35.2-167.5-89c-0.3-0.3-0.5-0.8-0.5-1l-44.8,29.9c0.3,0.3,0.5,0.8,0.5,1
C89.8,467.2,167.7,512,256,512c141.3,0,256-114.7,256-256C512,203.9,496.4,155.4,469.5,114.9z"/>
<path class="st2" d="M256,256l-121.7-81.2V337c1.3-0.8,2.3-1.5,0,0l76.4-23.6L256,256z"/>
<path class="st3" d="M134.3,337h234.9c4.8,0,8.6-3.8,8.6-8.6V174.8L134.3,337z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><path d="M53.8 256c0-111.7 90.5-202.2 202.2-202.2 70.2 0 132 35.7 168.2 90l39.7 7.8 5-37.7C423 45.3 344.8 0 256 0 114.7 0 0 114.7 0 256c0 52.6 15.8 101.3 43 142.1l38.5 5 6.3-35c-21.4-32.1-34-70.6-34-112.1" style="fill:#0067b9"/><path d="M469.5 114.9c-.3-.3-.5-.5-.8-1L424 143.8c.3.3.5.5.8 1 21.1 31.9 33.4 70.2 33.4 111.2 0 111.7-90.5 202.2-202.2 202.2-69.7 0-131.3-35.2-167.5-89-.3-.3-.5-.8-.5-1l-44.8 29.9c.3.3.5.8.5 1C89.8 467.2 167.7 512 256 512c141.3 0 256-114.7 256-256 0-52.1-15.6-100.6-42.5-141.1" style="fill:#69b3e7"/><path d="m256 256-121.7-81.2V337c1.3-.8 2.3-1.5 0 0l76.4-23.6z" style="fill:#ffc107"/><path d="M134.3 337h234.9c4.8 0 8.6-3.8 8.6-8.6V174.8z" style="fill:#333e48"/></svg>

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 781 B