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 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" style="enable-background:new 0 0 32 32" xml:space="preserve" viewBox="4.57 0.28 22.05 31.45"><style type="text/css">.st0{opacity:.56}.st0,.st1,.st2{fill:#7bdef4;stroke:#57afde;stroke-width:.25;stroke-miterlimit:10;enable-background:new}.st1{opacity:.28}.st2{opacity:.69}</style><g><g><polygon points="15.7 31.6 4.7 26.1 4.7 21.2 15.7 26.6" class="st0"/><polygon points="15.5 31.6 26.5 26.1 26.5 21.2 15.5 26.6" class="st1"/><polygon points="15.5 15.6 26.5 21 26.5 26 15.5 20.5" class="st0"/><polygon points="15.7 15.6 4.7 21 4.7 26 15.7 20.5" class="st2"/></g><g><polygon points="15.7 24 4.7 18.5 4.7 13.6 15.7 19" class="st0"/><polygon points="15.5 24 26.5 18.5 26.5 13.6 15.5 19" class="st1"/><polygon points="15.5 8 26.5 13.5 26.5 18.4 15.5 12.9" class="st0"/><polygon points="15.7 8 4.7 13.5 4.7 18.4 15.7 12.9" class="st2"/></g><g><polygon points="15.7 16.4 4.7 11 4.7 6 15.7 11.5" class="st0"/><polygon points="15.5 16.4 26.5 11 26.5 6 15.5 11.5" class="st1"/><polygon points="15.5 .4 26.5 5.9 26.5 10.8 15.5 5.4" class="st0"/><polygon points="15.7 .4 4.7 5.9 4.7 10.8 15.7 5.4" class="st2"/></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="4.57 0.28 22.05 31.45"><style>.st0{opacity:.56}.st0,.st1,.st2{fill:#7bdef4;stroke:#57afde;stroke-width:.25;stroke-miterlimit:10;enable-background:new}.st1{opacity:.28}.st2{opacity:.69}</style><path d="m15.7 31.6-11-5.5v-4.9l11 5.4z" class="st0"/><path d="m15.5 31.6 11-5.5v-4.9l-11 5.4z" class="st1"/><path d="m15.5 15.6 11 5.4v5l-11-5.5z" class="st0"/><path d="M15.7 15.6 4.7 21v5l11-5.5z" class="st2"/><path d="m15.7 24-11-5.5v-4.9l11 5.4z" class="st0"/><path d="m15.5 24 11-5.5v-4.9l-11 5.4z" class="st1"/><path d="m15.5 8 11 5.5v4.9l-11-5.5z" class="st0"/><path d="m15.7 8-11 5.5v4.9l11-5.5z" class="st2"/><path d="M15.7 16.4 4.7 11V6l11 5.5z" class="st0"/><path d="m15.5 16.4 11-5.4V6l-11 5.5z" class="st1"/><path d="m15.5.4 11 5.5v4.9l-11-5.4z" class="st0"/><path d="m15.7.4-11 5.5v4.9l11-5.4z" class="st2"/></svg>

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 929 B