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,10 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" image-rendering="optimizeQuality" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" x="0px" y="0px" style="enable-background:new 0 0 512 512;" xml:space="preserve" viewBox="0.05 25.24 511.95 461.55">
<style type="text/css">
.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#78BF40;}
.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#00689E;}
</style>
<g>
<path class="st0" d="M344.6,367.9L260,283.3c-0.3-0.4-0.6-0.8-0.9-1.2C287.5,310.6,316.1,339.3,344.6,367.9z M262.9,224.7 l62.5-62.4L262.9,224.7L262.9,224.7z M325.3,162.3l-78.1-78.1c-9.5-9.5-23.7-7.6-31.1-0.3L59.9,240.2c-8.9,8.9-8.3,22.9,0,31.2 l13.8,13.9l-60.6-60.6l0.1-0.2L200.5,37.4c14.6-14.6,41-17,58.9-2l192.1,192.1l-95.7-95.7L325.3,162.3L325.3,162.3z M216.8,428.3 c0.7,0.6,1.4,1.2,2.2,1.7c8.3,5.6,19.3,5.2,27.6-3.1l47.3-47.2l31.2,31.2l-62.8,62.8c-20.7,20.7-48.7,13.8-62.5,0.1L13.4,287.3 c0,0,0,0,0,0l186.4,186.5c13.8,13.7,41.7,20.6,62.4,0L216.8,428.3z M387.4,348.6l65,65l-0.1,0.1C430.7,392,409.1,370.3,387.4,348.6 z M356.4,193.4l46.4,46.4L356.4,193.4z M380.1,293.7l-7.6,7.6l-0.4,0.4l0.4-0.4L380.1,293.7z"/>
<path class="st1" d="M512,473.4c-13.3,14.3-42.6,19.6-62.2,0c-63-63-127.1-127.8-190.7-191.3c-12-16.1-12.9-40.8,3.8-57.4 l62.5-62.5l0,0l30.5-30.5l95.7,95.7c13,15.6,15.5,41.5-1.8,58.9l-62.2,62.2C429.1,390.3,470.3,431.7,512,473.4L512,473.4z M340.8,302l-30.9-30.9c-8-8-9.2-21.9,0-31.1l46.5-46.5l46.4,46.4c8.4,8.4,9.3,21.8,0.1,31.1c-10.2,10.1-20.3,20.3-30.5,30.4 l-0.7,0.7C363.2,310.5,349.3,310.5,340.8,302z M262.3,473.7c-20.7,20.6-48.7,13.8-62.4,0L13.4,287.2c-16.9-16.9-18.6-44-0.2-62.6 L135,346.4l80.7,80.7c0.3,0.3,0.6,0.6,0.9,0.8C216.6,428,262.3,473.7,262.3,473.7z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" viewBox="0.05 25.24 511.95 461.55"><path d="M344.6 367.9 260 283.3l-.9-1.2zm-81.7-143.2 62.5-62.4zm62.4-62.4-78.1-78.1c-9.5-9.5-23.7-7.6-31.1-.3L59.9 240.2c-8.9 8.9-8.3 22.9 0 31.2l13.8 13.9-60.6-60.6.1-.2L200.5 37.4c14.6-14.6 41-17 58.9-2l192.1 192.1-95.7-95.7zm-108.5 266c.7.6 1.4 1.2 2.2 1.7 8.3 5.6 19.3 5.2 27.6-3.1l47.3-47.2 31.2 31.2-62.8 62.8c-20.7 20.7-48.7 13.8-62.5.1L13.4 287.3l186.4 186.5c13.8 13.7 41.7 20.6 62.4 0zm170.6-79.7 65 65-.1.1c-21.6-21.7-43.2-43.4-64.9-65.1m-31-155.2 46.4 46.4zm23.7 100.3-7.6 7.6-.4.4.4-.4z" style="fill-rule:evenodd;clip-rule:evenodd;fill:#78bf40"/><path d="M512 473.4c-13.3 14.3-42.6 19.6-62.2 0-63-63-127.1-127.8-190.7-191.3-12-16.1-12.9-40.8 3.8-57.4l62.5-62.5 30.5-30.5 95.7 95.7c13 15.6 15.5 41.5-1.8 58.9l-62.2 62.2c41.5 41.8 82.7 83.2 124.4 124.9M340.8 302l-30.9-30.9c-8-8-9.2-21.9 0-31.1l46.5-46.5 46.4 46.4c8.4 8.4 9.3 21.8.1 31.1-10.2 10.1-20.3 20.3-30.5 30.4l-.7.7c-8.5 8.4-22.4 8.4-30.9-.1m-78.5 171.7c-20.7 20.6-48.7 13.8-62.4 0L13.4 287.2c-16.9-16.9-18.6-44-.2-62.6L135 346.4l80.7 80.7c.3.3.6.6.9.8 0 .1 45.7 45.8 45.7 45.8" style="fill-rule:evenodd;clip-rule:evenodd;fill:#00689e"/></svg>

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB