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,12 +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" style="enable-background:new 0 0 512 512;" xml:space="preserve" viewBox="118.8 -0.04 274.4 512.18">
<style type="text/css">
.st0{fill:#E52A1C;}
</style>
<g id="_x3C_Group_x3E_">
<g>
<path class="st0" d="M176,390.1L141.7,410c-14.1,8.1-22.9,23.3-22.9,39.6v39.6c0,17.6,19,28.6,34.3,19.9l34.3-19.9 c14.1-8.1,22.9-23.3,22.9-39.6V410C210.3,392.4,191.3,381.4,176,390.1z"/>
<path class="st0" d="M267.4,196.6l-125.7,72.6c-14.1,8.1-22.9,23.3-22.9,39.6v39.6c0,17.6,19,28.6,34.3,19.9l125.7-72.6 c14.1-8.1,22.9-23.3,22.9-39.6v-39.6C301.7,198.9,282.7,187.9,267.4,196.6z"/>
<path class="st0" d="M358.8,3L141.7,128.5c-14.1,8.1-22.9,23.3-22.9,39.6v39.6c0,17.6,19,28.6,34.3,19.9L370.3,102 c14.1-8.1,22.9-23.3,22.9-39.6V22.9C393.1,5.3,374.1-5.7,358.8,3z"/>
</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="118.8 -0.04 274.4 512.18"><style>.st0{fill:#e52a1c}</style><g id="_x3C_Group_x3E_"><path d="M176 390.1 141.7 410c-14.1 8.1-22.9 23.3-22.9 39.6v39.6c0 17.6 19 28.6 34.3 19.9l34.3-19.9c14.1-8.1 22.9-23.3 22.9-39.6V410c0-17.6-19-28.6-34.3-19.9M267.4 196.6l-125.7 72.6c-14.1 8.1-22.9 23.3-22.9 39.6v39.6c0 17.6 19 28.6 34.3 19.9l125.7-72.6c14.1-8.1 22.9-23.3 22.9-39.6v-39.6c0-17.6-19-28.6-34.3-19.9M358.8 3 141.7 128.5c-14.1 8.1-22.9 23.3-22.9 39.6v39.6c0 17.6 19 28.6 34.3 19.9L370.3 102c14.1-8.1 22.9-23.3 22.9-39.6V22.9C393.1 5.3 374.1-5.7 358.8 3" class="st0"/></g></svg>

Before

Width:  |  Height:  |  Size: 898 B

After

Width:  |  Height:  |  Size: 681 B