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:svg="http://www.w3.org/2000/svg" id="svg2" width="1600" height="1280" version="1.1" viewBox="0 0 1600 1280" xml:space="preserve"><metadata id="metadata8"/><defs id="defs6"><clipPath id="clipPath16" clipPathUnits="userSpaceOnUse"><path id="path18" d="m 0,1024 1280,0 L 1280,0 0,0 0,1024 Z"/></clipPath></defs><g id="g10" transform="matrix(1.25,0,0,-1.25,0,1280)"><g id="g12" transform="matrix(2.0467721,0,0,2.0467721,-667.88766,-535.45945)"><g id="g14" clip-path="url(#clipPath16)"><g id="g20" transform="translate(416.1574,511.7812)"><path d="m 0,0 c 0,123.015 99.724,222.739 222.739,222.739 123.015,0 222.739,-99.724 222.739,-222.739 0,-123.015 -99.724,-222.739 -222.739,-222.739 C 99.724,-222.739 0,-123.015 0,0" style="fill:#1c6b8f;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path22"/></g><g id="g24" transform="translate(533.2743,420.8088)"><path d="m 0,0 119.792,-131.766 c 0,0 111.646,-5.709 183.371,119.762 0,0 28.08,67.151 25.198,102.976 -2.882,35.826 -0.457,14.262 -0.457,14.262 l -102.296,114.738 -24.384,-27.801 -36.94,0 -44.492,0 -58.498,0 -52.964,0 L -14.365,181.944 27.279,143.262 -3.523,115.239 8.33,44.083 0,0 Z" style="fill:#16536f;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26"/></g><g id="g28" transform="translate(518.909,640.7811)"><path d="m 0,0 101.934,-16.153 c 11.961,-1.896 24.145,-1.896 36.106,0 L 239.974,0 l 0,-38.028 -101.934,-16.154 c -11.961,-1.895 -24.145,-1.895 -36.106,0 L 0,-38.028 0,0 Z" style="fill:#99bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path30"/></g><g id="g32" transform="translate(518.909,640.7811)"><path d="m 0,0 101.934,-16.153 c 11.961,-1.896 24.145,-1.896 36.106,0 L 239.974,0 l 0,-38.028 -101.934,-16.154 c -11.961,-1.895 -24.145,-1.895 -36.106,0 L 0,-38.028 0,0 Z" style="fill:none;stroke:#fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" id="path34"/></g><g id="g36" transform="translate(553.9865,526.0424)"><path d="m 0,0 0,-57.042 c 0,-11.147 3.714,-20.326 11.147,-27.538 13.768,-13.769 38.136,-20.654 73.106,-20.654 41.522,0 67.748,7.433 78.68,22.293 4.806,6.777 7.213,15.408 7.213,25.899 L 170.146,0 0,0 Z m -19.66,38.028 208.446,0 c 8.898,0 16.11,-7.212 16.11,-16.11 l 0,-81.256 c 0,-55.945 -40.324,-83.924 -120.971,-83.924 -33.879,0 -61.745,6.449 -83.596,19.342 -11.147,6.557 -19.835,15.357 -26.063,26.39 -6.229,11.039 -9.343,23.768 -9.343,38.192 l 0,81.948 c 0,8.515 6.902,15.418 15.417,15.418" style="fill:#00b4ff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path38"/></g><g id="g40" transform="translate(553.9865,526.0424)"><path d="m 0,0 0,-57.042 c 0,-11.147 3.714,-20.326 11.147,-27.538 13.768,-13.769 38.136,-20.654 73.106,-20.654 41.522,0 67.748,7.433 78.68,22.293 4.806,6.777 7.213,15.408 7.213,25.899 L 170.146,0 0,0 Z m -19.66,38.028 208.446,0 c 8.898,0 16.11,-7.212 16.11,-16.11 l 0,-81.256 c 0,-55.945 -40.324,-83.924 -120.971,-83.924 -33.879,0 -61.745,6.449 -83.596,19.342 -11.147,6.557 -19.835,15.357 -26.063,26.39 -6.229,11.039 -9.343,23.768 -9.343,38.192 l 0,81.948 c 0,8.515 6.902,15.418 15.417,15.418 z" style="fill:none;stroke:#fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" id="path42"/></g><g id="g44" transform="translate(523.1484,439.9793)"><path d="m 0,0 30.838,13.372 0,72.691 170.146,0 0,-14.261 34.75,14.261 0,21.919 c 0,0 -1.928,16.109 -16.109,16.109 l -208.447,0 c 0,0 -15.417,-0.45 -15.417,-15.417 l 0,-88.214 L 0,0 Z" style="fill:#5dcfff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path46"/></g></g></g></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1600" height="1280"><defs><clipPath id="a" clipPathUnits="userSpaceOnUse"><path d="M0 1024h1280V0H0z"/></clipPath></defs><g clip-path="url(#a)" transform="matrix(2.55847 0 0 -2.55847 -834.86 1949.324)"><path d="M0 0c0 123.015 99.724 222.739 222.739 222.739S445.478 123.015 445.478 0s-99.724-222.739-222.739-222.739S0-123.015 0 0" style="fill:#1c6b8f;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(416.157 511.781)"/><path d="m0 0 119.792-131.766s111.646-5.709 183.371 119.762c0 0 28.08 67.151 25.198 102.976s-.457 14.262-.457 14.262L225.608 219.972l-24.384-27.801H8.33l-22.695-10.227 41.644-38.682-30.802-28.023L8.33 44.083z" style="fill:#16536f;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(533.274 420.809)"/><path d="m0 0 101.934-16.153a115.3 115.3 0 0 1 36.106 0L239.974 0v-38.028L138.04-54.182a115.4 115.4 0 0 0-36.106 0L0-38.028z" style="fill:#99bf00;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(518.909 640.781)"/><path d="m0 0 101.934-16.153a115.3 115.3 0 0 1 36.106 0L239.974 0v-38.028L138.04-54.182a115.4 115.4 0 0 0-36.106 0L0-38.028z" style="fill:none;stroke:#fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" transform="translate(518.909 640.781)"/><path d="M0 0v-57.042q-.001-16.72 11.147-27.538 20.652-20.654 73.106-20.654 62.283.002 78.68 22.293c4.806 6.777 7.213 15.408 7.213 25.899V0zm-19.66 38.028h208.446c8.898 0 16.11-7.212 16.11-16.11v-81.256c0-55.945-40.324-83.924-120.971-83.924q-50.819.001-83.596 19.342c-11.147 6.557-19.835 15.357-26.063 26.39q-9.343 16.557-9.343 38.192V22.61c0 8.515 6.902 15.418 15.417 15.418" style="fill:#00b4ff;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(553.986 526.042)"/><path d="M0 0v-57.042q-.001-16.72 11.147-27.538 20.652-20.654 73.106-20.654 62.283.002 78.68 22.293c4.806 6.777 7.213 15.408 7.213 25.899V0zm-19.66 38.028h208.446c8.898 0 16.11-7.212 16.11-16.11v-81.256c0-55.945-40.324-83.924-120.971-83.924q-50.819.001-83.596 19.342c-11.147 6.557-19.835 15.357-26.063 26.39q-9.343 16.557-9.343 38.192V22.61c0 8.515 6.902 15.418 15.417 15.418z" style="fill:none;stroke:#fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" transform="translate(553.986 526.042)"/><path d="m0 0 30.838 13.372v72.691h170.146V71.802l34.75 14.261v21.919s-1.928 16.109-16.109 16.109H11.178s-15.417-.45-15.417-15.417V20.46z" style="fill:#5dcfff;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(523.148 439.98)"/></g></svg>

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB