mirror of
https://github.com/walkxcode/dashboard-icons.git
synced 2025-11-27 23:28:41 +01:00
fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1,22 +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" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{clip-path:url(#SVGID_00000070797465557635024280000012513064944366845106_);}
|
||||
.st1{fill:#ffffff;}
|
||||
</style>
|
||||
<g>
|
||||
<path d="M154.6,2.5h202.8c84,0,152.1,68.1,152.1,152.1v202.8c0,84-68.1,152.1-152.1,152.1H154.6c-84,0-152.1-68.1-152.1-152.1 V154.6C2.4,70.6,70.6,2.5,154.6,2.5z" fill="#ffffff"/>
|
||||
<g transform="translate(-65.392282 -65.444691) scale(1.1042818)">
|
||||
<g>
|
||||
<defs fill="#ffffff">
|
||||
<path id="SVGID_1_" d="M132.8,31.4h316.4c56,0,101.4,45.4,101.4,101.4v316.4c0,56-45.4,101.4-101.4,101.4H132.8 c-56,0-101.4-45.4-101.4-101.4V132.9C31.4,76.9,76.8,31.4,132.8,31.4z" fill="#ffffff"/>
|
||||
</defs>
|
||||
<clipPath id="SVGID_00000181052418334525631010000006610250529580435361_" fill="#ffffff">
|
||||
<use xlink:href="#SVGID_1_" style="overflow:visible;" fill="#ffffff"/>
|
||||
</clipPath>
|
||||
<g style="clip-path:url(#SVGID_00000181052418334525631010000006610250529580435361_);">
|
||||
<path class="st1" d="M399.1,377.8c-8.8,25.6-26.3,47.2-49.5,61c-23.2,13.8-50.6,19-77.2,14.6c-26.7-4.4-50.9-18.2-68.3-38.8 s-27.1-46.8-27.1-73.8v-55.9l40.1,16.8v39.1c0,10.5,2.2,21,6.6,30.5c4.4,9.6,10.7,18.1,18.7,25.1c1.5,1.3,3.1,2.6,4.7,3.8 c11.8,8.8,26.1,13.9,40.8,14.5c0.5,0,1,0,1.5,0.1c0.5,0,1.1,0,1.7,0h1.7c0.6,0,1,0,1.5-0.1c14.7-0.6,29-5.7,40.8-14.5 c1.6-1.2,3.2-2.5,4.7-3.8c10.4-9.1,18.1-21,22.1-34.2L399.1,377.8z M405.1,241.4v99.4c0,1.3,0,2.6-0.1,3.9l-40-16.7v-86.5 c0-19.1-7.4-37.5-20.7-51.3c-13.2-13.8-31.3-21.9-50.4-22.6c-19.1-0.8-37.7,5.9-52,18.6c-14.3,12.7-23.1,30.4-24.6,49.5 c-0.1,1.9-0.2,3.9-0.2,5.9v24.7l-40.1-16.8v-122H291c30.3,0,59.3,12,80.7,33.4S405.1,211.1,405.1,241.4z" fill="#ffffff"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" viewBox="0 0 512 512"><path fill="#fff" d="M154.6 2.5h202.8c84 0 152.1 68.1 152.1 152.1v202.8c0 84-68.1 152.1-152.1 152.1H154.6c-84 0-152.1-68.1-152.1-152.1V154.6C2.4 70.6 70.6 2.5 154.6 2.5"/><g transform="translate(-65.392 -65.445)scale(1.10428)"><defs fill="#fff"><path id="a" fill="#fff" d="M132.8 31.4h316.4c56 0 101.4 45.4 101.4 101.4v316.4c0 56-45.4 101.4-101.4 101.4H132.8c-56 0-101.4-45.4-101.4-101.4V132.9c0-56 45.4-101.5 101.4-101.5"/></defs><clipPath id="b" fill="#fff"><use xlink:href="#a" style="overflow:visible"/></clipPath><g style="clip-path:url(#b)"><path d="M399.1 377.8c-8.8 25.6-26.3 47.2-49.5 61s-50.6 19-77.2 14.6c-26.7-4.4-50.9-18.2-68.3-38.8S177 367.8 177 340.8v-55.9l40.1 16.8v39.1c0 10.5 2.2 21 6.6 30.5 4.4 9.6 10.7 18.1 18.7 25.1 1.5 1.3 3.1 2.6 4.7 3.8 11.8 8.8 26.1 13.9 40.8 14.5.5 0 1 0 1.5.1h3.4c.6 0 1 0 1.5-.1 14.7-.6 29-5.7 40.8-14.5 1.6-1.2 3.2-2.5 4.7-3.8 10.4-9.1 18.1-21 22.1-34.2zm6-136.4v99.4c0 1.3 0 2.6-.1 3.9L365 328v-86.5c0-19.1-7.4-37.5-20.7-51.3-13.2-13.8-31.3-21.9-50.4-22.6-19.1-.8-37.7 5.9-52 18.6a73.85 73.85 0 0 0-24.6 49.5c-.1 1.9-.2 3.9-.2 5.9v24.7L177 249.5v-122h114c30.3 0 59.3 12 80.7 33.4s33.4 50.2 33.4 80.5" style="fill:#fff"/></g></g></svg>
|
||||
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.3 KiB |
Reference in New Issue
Block a user