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" version="1.1" viewBox="0 0 1000 677.41"><g><path fill="#644d3f" d="m125.13 0-105.01 30.554-20.123 25.455 91.39 31.878 26.506-32.15 6.967 2.958 6.967-2.958 27.596 32.967 90.573-32.15-21.174-27.596zm0 8.329 73.447 21.68-73.447 20.629-74.225-21.446zm5.761 63.755-0.272 96.995 97.54-39.935 0.272-54.375-73.136 24.093-21.446-26.779zm-14.051 0.272-21.446 26.78-73.136-24.093 0.272 54.375 97.54 39.935-0.272-96.995z" transform="matrix(4 0 0 4 .012 0)"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 677.41"><path fill="#644d3f" d="M500.532 0 80.492 122.216 0 224.036l365.56 127.512 106.024-128.6 27.868 11.832 27.868-11.832 110.384 131.868 362.292-128.6L915.3 115.832zm0 33.316 293.788 86.72-293.788 82.516-296.9-85.784zm23.044 255.02-1.088 387.98 390.16-159.74 1.088-217.5-292.544 96.372-85.784-107.116zm-56.204 1.088-85.784 107.12-292.544-96.372 1.088 217.5 390.16 159.74-1.088-387.98z"/></svg>

Before

Width:  |  Height:  |  Size: 496 B

After

Width:  |  Height:  |  Size: 455 B