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,20 +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="83.39 0 345.06 511.91">
<style type="text/css">
.st0{fill:url(#flame_00000056425217190729757960000011411237412415252377_);}
.st1{fill:#FFFFFF;}
.st2{fill:#03394D;}
.st3{fill:#CD5029;}
</style>
<g id="FireflyIII_Logo">
<linearGradient id="flame_00000103261017664000585920000010544691010162937473_" gradientUnits="userSpaceOnUse" x1="-50.8923" y1="651.9916" x2="-50.8923" y2="651.2006" gradientTransform="matrix(436.1719 0 0 -647.181 22453.8066 421956.625)">
<stop offset="0" style="stop-color:#FFA284"/>
<stop offset="0.5" style="stop-color:#CD5029"/>
</linearGradient>
<path id="flame" style="fill:url(#flame_00000103261017664000585920000010544691010162937473_);" d="M215.6,0 c0,0,19.5,66.2-18,104.7c-37.5,38.5-33.5,81.1-18.3,101.4s14.2,35.5,2,46.7c-12.2,11.2-22.3,19.3-29.4,1 c-7.1-18.3-15.2-18.3-18.3-27.4s-9.1-25.4-9.1-25.4s-19.3,30.4-31.4,48.7s-12.2,46.7-4.1,61.9c8.1,15.2,5.1,33.5-1,58.8 c-6.1,25.4,2,63.9,30.4,79.1c28.4,15.2,62.9,27.4,78.1,41.6c15.2,14.2,50.7,27.4,96.4,17.2c45.6-10.1,103.5-56.8,113.6-88.2 c0,0,26.4-29.4,21.3-68c-5.1-38.5-23.3-37.5-31.4-66.9c-8.1-29.4,17.6-22.2-4.1-72.7c0,0-9.6-24-46.2-41.4 c-23.5-11.1-7.5-61.5-49.1-112.2S215.6,0,215.6,0z"/>
<path id="pig-body" class="st1" d="M200.9,251.5l1.8,41.9c0,0-31.7,23.4-36,53.8l-12.7,1c0,0-9.1,2-9.1,11.2c0,9.1,0,29.4,0,29.4 s3,9.1,10.1,9.1l13-0.3c0,0,6.3,24.1,28.9,40v20.2c0,0-1.6,6.7,12.3,8.7c13.8,2,32.2,1.8,35.2-1.2c3-3,3-3.6,3-7.1 c0,0,16.8,4,47.7,0v4c0,0,2.8,5.5,22.9,5.5s26.1-2.4,29.7-9.5v-19.8c0,0,29.3-28.7,28.3-72.6c-0.9-37.8-12.6-50.9-28.3-65.6 c-17.9-16.8-55.3-24.7-93.3-20.1C254.3,280.1,235.1,245.3,200.9,251.5z"/>
<circle id="eye" class="st2" cx="197" cy="358.8" r="7.5"/>
<path id="tail" class="st3" d="M374.7,340c0,0-14.4-6.9-32.2,3.2c0,0-21.1-7.1-32.4,2.1c-11.7,9.5-12.9,20.7-12.3,33.8 c0,0,10.2-34.7,35.8-25.8c0,0-18.2,32,10.1,37.6c0,0,6.7,0,12.2-3.4c5.3-3.2,9.4-9,7.7-19.6c0,0-3.4-10.6-12.3-16.9 c0,0,8.7-6.2,25.3-1.7L374.7,340z"/>
<path id="tail-negative" class="st1" d="M343.1,357.8c0,0-13.2,24.9,4.4,23.5c0,0,9.4-4.5,3.9-13.5 C345.8,358.4,343.1,357.8,343.1,357.8z"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Layer_1" x="0" y="0" version="1.1" viewBox="83.39 0 345.06 511.91"><style>.st1{fill:#fff}</style><g id="FireflyIII_Logo"><linearGradient id="flame_00000103261017664000585920000010544691010162937473_" x1="-50.892" x2="-50.892" y1="651.992" y2="651.201" gradientTransform="matrix(436.1719 0 0 -647.181 22453.807 421956.625)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#ffa284"/><stop offset=".5" style="stop-color:#cd5029"/></linearGradient><path id="flame" d="M215.6 0s19.5 66.2-18 104.7-33.5 81.1-18.3 101.4 14.2 35.5 2 46.7-22.3 19.3-29.4 1-15.2-18.3-18.3-27.4-9.1-25.4-9.1-25.4-19.3 30.4-31.4 48.7-12.2 46.7-4.1 61.9 5.1 33.5-1 58.8c-6.1 25.4 2 63.9 30.4 79.1s62.9 27.4 78.1 41.6 50.7 27.4 96.4 17.2c45.6-10.1 103.5-56.8 113.6-88.2 0 0 26.4-29.4 21.3-68-5.1-38.5-23.3-37.5-31.4-66.9s17.6-22.2-4.1-72.7c0 0-9.6-24-46.2-41.4-23.5-11.1-7.5-61.5-49.1-112.2S215.6 0 215.6 0" style="fill:url(#flame_00000103261017664000585920000010544691010162937473_)"/><path id="pig-body" d="m200.9 251.5 1.8 41.9s-31.7 23.4-36 53.8l-12.7 1s-9.1 2-9.1 11.2v29.4s3 9.1 10.1 9.1l13-.3s6.3 24.1 28.9 40v20.2s-1.6 6.7 12.3 8.7c13.8 2 32.2 1.8 35.2-1.2s3-3.6 3-7.1c0 0 16.8 4 47.7 0v4s2.8 5.5 22.9 5.5 26.1-2.4 29.7-9.5v-19.8s29.3-28.7 28.3-72.6c-.9-37.8-12.6-50.9-28.3-65.6-17.9-16.8-55.3-24.7-93.3-20.1-.1 0-19.3-34.8-53.5-28.6" class="st1"/><circle id="eye" cx="197" cy="358.8" r="7.5" style="fill:#03394d"/><path id="tail" d="M374.7 340s-14.4-6.9-32.2 3.2c0 0-21.1-7.1-32.4 2.1-11.7 9.5-12.9 20.7-12.3 33.8 0 0 10.2-34.7 35.8-25.8 0 0-18.2 32 10.1 37.6 0 0 6.7 0 12.2-3.4 5.3-3.2 9.4-9 7.7-19.6 0 0-3.4-10.6-12.3-16.9 0 0 8.7-6.2 25.3-1.7z" style="fill:#cd5029"/><path id="tail-negative" d="M343.1 357.8s-13.2 24.9 4.4 23.5c0 0 9.4-4.5 3.9-13.5-5.6-9.4-8.3-10-8.3-10" class="st1"/></g></svg>

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB