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 @@
<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 256 256" style="enable-background:new 0 0 256 256;" xml:space="preserve">
<style type="text/css">
.st0{fill:#0084FF;stroke:#ffffff;stroke-width:10.3641;stroke-miterlimit:15.118;}
.st1{fill:#000000;stroke:#ffffff;stroke-width:9.9999;stroke-miterlimit:15.118;}
.st2{fill:none;stroke:#ffffff;stroke-width:9.9999;stroke-linecap:round;stroke-miterlimit:15.118;}
</style>
<g>
<circle class="st0" cx="128" cy="128" r="122.8" fill="#ffffff"/>
<g>
<circle class="st1" cx="128" cy="128" r="43.7" fill="#ffffff"/>
<path class="st2" d="M201.8,128c0,40.7-33,73.8-73.8,73.8 M54.2,128c0-40.7,33-73.8,73.8-73.8" fill="#ffffff"/>
<path class="st2" d="M224.9,128c0,1.2,0,2.5-0.1,3.7 M222.6,149.3c-9.7,43.3-48.4,75.6-94.6,75.6 M31.1,128c0-1.1,0-2.2,0.1-3.3 M33,108.7c9-44.2,48.1-77.6,95-77.6" fill="#ffffff"/>
<circle class="st1" cx="128" cy="128" r="9" fill="#ffffff"/>
</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 256 256"><style>.st1,.st2{fill:#000;stroke:#fff;stroke-width:9.9999;stroke-miterlimit:15.118}.st2{fill:none;stroke-linecap:round}</style><circle cx="128" cy="128" r="122.8" style="fill:#0084ff;stroke:#fff;stroke-width:10.3641;stroke-miterlimit:15.118"/><circle cx="128" cy="128" r="43.7" fill="#fff" class="st1"/><path fill="#fff" d="M201.8 128c0 40.7-33 73.8-73.8 73.8M54.2 128c0-40.7 33-73.8 73.8-73.8" class="st2"/><path fill="#fff" d="M224.9 128c0 1.2 0 2.5-.1 3.7m-2.2 17.6c-9.7 43.3-48.4 75.6-94.6 75.6M31.1 128c0-1.1 0-2.2.1-3.3m1.8-16c9-44.2 48.1-77.6 95-77.6" class="st2"/><circle cx="128" cy="128" r="9" fill="#fff" class="st1"/></svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 758 B