fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1,5 +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="0.09 158.8 511.91 194.21">
|
||||
<g>
|
||||
<path d="M107.3,190c7.2-8.7,10.8-19.9,10-31.2c-11.1,1.1-21.3,6.4-28.5,14.9c-7.3,8.2-10.9,19-10.2,29.9 C89.7,203.9,100.3,198.8,107.3,190 M116.6,205.7c-15.9-0.9-29.3,9.1-36.9,9.1c-7.6,0-19.2-8.6-31.7-8.4 c-16.7,0.5-31.8,9.8-39.8,24.4c-17,29.6-4.5,73.6,12,97.6c8.1,11.4,17.7,25.1,30.6,24.6s16.8-8,31.5-8s19,8,31.7,7.7 c12.7-0.3,21.6-11.5,29.6-23.9c5.7-8.5,10.2-17.7,13.3-27.5c-15.6-6.9-25.7-22.3-25.8-39.4c0.2-15.1,8-29,20.8-37 C143.7,213.5,130.7,206.3,116.6,205.7 M218.1,182.8v32.5H244v21.4h-25.9v76.8c0,11.5,5.1,17.3,16.5,17.3c3.1-0.1,6.2-0.3,9.3-0.7 v21.6c-5.1,0.8-10.2,1.2-15.3,1.1c-26.8,0-37.2-10.4-37.2-36.6v-79.1H171v-21.5h19.8v-32.9L218.1,182.8z M334.6,351.6h-28.4 l-47.7-135.9h28.3l33.5,109.2h0.7l33.5-109.2h27.7L334.6,351.6z M459.4,351.6h-24.6v-55.7h-52.7v-24.5h52.6v-55.7h24.6v55.7H512 v24.5h-52.6V351.6z" fill="#ffffff"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0.09 158.8 511.91 194.21"><path fill="#fff" d="M107.3 190c7.2-8.7 10.8-19.9 10-31.2-11.1 1.1-21.3 6.4-28.5 14.9-7.3 8.2-10.9 19-10.2 29.9 11.1.3 21.7-4.8 28.7-13.6m9.3 15.7c-15.9-.9-29.3 9.1-36.9 9.1s-19.2-8.6-31.7-8.4c-16.7.5-31.8 9.8-39.8 24.4-17 29.6-4.5 73.6 12 97.6 8.1 11.4 17.7 25.1 30.6 24.6s16.8-8 31.5-8 19 8 31.7 7.7 21.6-11.5 29.6-23.9c5.7-8.5 10.2-17.7 13.3-27.5-15.6-6.9-25.7-22.3-25.8-39.4.2-15.1 8-29 20.8-37-8.2-11.4-21.2-18.6-35.3-19.2m101.5-22.9v32.5H244v21.4h-25.9v76.8c0 11.5 5.1 17.3 16.5 17.3 3.1-.1 6.2-.3 9.3-.7v21.6c-5.1.8-10.2 1.2-15.3 1.1-26.8 0-37.2-10.4-37.2-36.6v-79.1H171v-21.5h19.8v-32.9zm116.5 168.8h-28.4l-47.7-135.9h28.3l33.5 109.2h.7l33.5-109.2h27.7zm124.8 0h-24.6v-55.7h-52.7v-24.5h52.6v-55.7h24.6v55.7H512v24.5h-52.6z"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 835 B |
Reference in New Issue
Block a user