fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -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" x="0px" y="0px" style="enable-background:new 0 0 512 512;" xml:space="preserve" viewBox="0 76.5 512.1 359">
|
||||
<style type="text/css">
|
||||
.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#00BF6F;}
|
||||
</style>
|
||||
<g>
|
||||
<g>
|
||||
<path class="st0" d="M452.7,360.1c-4.6,0-8.8-1.8-11.9-4.6c1.1-9.3,1.8-18.7,1.9-28.2c2.9-1.9,6.3-3.1,10-3.1 c9.8,0,17.8,8.1,17.8,18C470.6,352.1,462.6,360.1,452.7,360.1C452.7,360.1,452.7,360.1,452.7,360.1 M59.3,360.1 c-9.9,0-17.8-8-17.8-17.8c0,0,0,0,0-0.1c0-9.9,8-18,17.8-18c3.7,0,7.1,1.2,10,3.1c0.1,9.5,0.8,18.9,1.9,28.2 C67.9,358.5,63.7,360.1,59.3,360.1 M451.5,281.4c-5,0-9.8,0.7-14.5,1.8c-17.8-70.7-75.5-125.4-147.6-138.3c-3.2-0.6-6.1-1-9.4-1.4 c0.5-17.7,1.4-38.2,27.3-56.6l-4.1-10.4c0,0-50.5,15.8-56.3,59.2c-2.5-11.8-26.1-26.6-37.7-29.4l-5.8,9.4c0,0,15.5,7.8,19.2,29.2 c-72.1,13-129.8,67.6-147.6,138.3c-4.7-1.2-9.6-1.8-14.5-1.8C27.1,281.4,0,308.6,0,342.2C0,375.8,27.1,403,60.5,403 c7.6,0,15.1-1.5,22.1-4.3c5.2,12.9,11.8,25.3,19.7,36.8l50.2-34l-0.4-0.6c-13.3-17.2-21.4-42.4-22.8-67.6 c-1.5-27.7,5.2-55.3,22.8-71.5c36.3-31.1,75.8-16.9,100.6,12.9h6.7c24.8-29.8,64.3-44,100.6-12.9c17.6,16.2,24.3,43.7,22.8,71.5 c-1.4,25.1-9.5,50.4-22.8,67.6l-0.4,0.5l50.2,34c7.9-11.5,14.5-23.8,19.7-36.8c7,2.8,14.5,4.2,22.1,4.3 c33.3,0,60.5-27.3,60.5-60.8C512,308.6,484.9,281.4,451.5,281.4"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 76.5 512.1 359"><path d="M452.7 360.1c-4.6 0-8.8-1.8-11.9-4.6 1.1-9.3 1.8-18.7 1.9-28.2 2.9-1.9 6.3-3.1 10-3.1 9.8 0 17.8 8.1 17.8 18 .1 9.9-7.9 17.9-17.8 17.9m-393.4 0c-9.9 0-17.8-8-17.8-17.8v-.1c0-9.9 8-18 17.8-18 3.7 0 7.1 1.2 10 3.1.1 9.5.8 18.9 1.9 28.2-3.3 3-7.5 4.6-11.9 4.6m392.2-78.7c-5 0-9.8.7-14.5 1.8-17.8-70.7-75.5-125.4-147.6-138.3-3.2-.6-6.1-1-9.4-1.4.5-17.7 1.4-38.2 27.3-56.6l-4.1-10.4s-50.5 15.8-56.3 59.2c-2.5-11.8-26.1-26.6-37.7-29.4l-5.8 9.4s15.5 7.8 19.2 29.2c-72.1 13-129.8 67.6-147.6 138.3-4.7-1.2-9.6-1.8-14.5-1.8-33.4 0-60.5 27.2-60.5 60.8S27.1 403 60.5 403c7.6 0 15.1-1.5 22.1-4.3 5.2 12.9 11.8 25.3 19.7 36.8l50.2-34-.4-.6c-13.3-17.2-21.4-42.4-22.8-67.6-1.5-27.7 5.2-55.3 22.8-71.5 36.3-31.1 75.8-16.9 100.6 12.9h6.7c24.8-29.8 64.3-44 100.6-12.9 17.6 16.2 24.3 43.7 22.8 71.5-1.4 25.1-9.5 50.4-22.8 67.6l-.4.5 50.2 34c7.9-11.5 14.5-23.8 19.7-36.8 7 2.8 14.5 4.2 22.1 4.3 33.3 0 60.5-27.3 60.5-60.8-.1-33.5-27.2-60.7-60.6-60.7" style="fill-rule:evenodd;clip-rule:evenodd;fill:#00bf6f"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.1 KiB |
Reference in New Issue
Block a user