fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1,37 +1 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 27.7.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 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{fill:#B3B3B3;}
|
||||
.st1{fill:#FFFFFF;}
|
||||
.st2{fill:none;}
|
||||
.st3{fill:url(#SVGID_1_);}
|
||||
.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
|
||||
</style>
|
||||
<g>
|
||||
<path class="st0" d="M143.8,431.2l7.7,4.5c32.2,19.1,69.2,29.2,106.8,29.2h0.1c115.7,0,209.8-94.1,209.9-209.8
|
||||
c0-56.1-21.8-108.8-61.4-148.4c-39.3-39.5-92.7-61.7-148.4-61.5c-115.8,0-209.9,94.1-210,209.8c-0.1,39.5,11.1,78.2,32.1,111.7
|
||||
l5,7.9L64.4,452L143.8,431.2z M3.7,512l35.8-130.8C17.5,342.9,5.8,299.5,5.9,255C5.9,115.8,119.2,2.6,258.4,2.6
|
||||
c67.5,0,130.9,26.3,178.6,74s73.9,111.1,73.9,178.6c-0.1,139.2-113.3,252.4-252.5,252.4h-0.1c-42.3,0-83.8-10.6-120.7-30.7L3.7,512
|
||||
z"/>
|
||||
<path class="st1" d="M1.1,509.4L37,378.6C14.8,340.2,3.2,296.7,3.3,252.4C3.3,113.2,116.6,0,255.8,0c67.5,0,130.9,26.3,178.6,74
|
||||
c47.7,47.7,73.9,111.1,73.9,178.6C508.2,391.8,394.9,505,255.8,505h-0.1c-42.3,0-83.8-10.6-120.7-30.7L1.1,509.4z"/>
|
||||
<path class="st2" d="M255.8,42.6c-115.8,0-209.9,94.1-210,209.8C45.8,291.9,57,330.6,78,364.1l5,7.9l-21.2,77.4l79.4-20.8l7.7,4.5
|
||||
c32.2,19.1,69.2,29.2,106.8,29.3h0.1c115.7,0,209.8-94.1,209.9-209.8c0.2-55.7-21.9-109.1-61.4-148.4
|
||||
C365,64.7,311.5,42.5,255.8,42.6L255.8,42.6z"/>
|
||||
|
||||
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="254.6656" y1="446.6369" x2="256.7934" y2="87.926" gradientTransform="matrix(1 0 0 -1 0 514.448)">
|
||||
<stop offset="0" style="stop-color:#57D163"/>
|
||||
<stop offset="1" style="stop-color:#23B33A"/>
|
||||
</linearGradient>
|
||||
<path class="st3" d="M255.8,42.6c-115.8,0-209.9,94.1-210,209.8C45.8,291.9,57,330.6,78,364.1l5,7.9l-21.2,77.4l79.4-20.8l7.7,4.5
|
||||
c32.2,19.1,69.2,29.2,106.8,29.2h0.1c115.7,0,209.8-94.1,209.9-209.8c0.2-55.7-21.9-109.1-61.4-148.4
|
||||
C365,64.7,311.5,42.5,255.8,42.6z"/>
|
||||
<path class="st4" d="M192.7,146.9c-4.7-10.5-9.7-10.7-14.2-10.9l-12.1-0.1c-4.2,0-11,1.6-16.8,7.9s-22.1,21.6-22.1,52.6
|
||||
s22.6,61,25.8,65.2s43.6,69.9,107.8,95.2c53.3,21,64.1,16.8,75.7,15.8c11.6-1.1,37.3-15.3,42.6-30c5.3-14.7,5.3-27.4,3.7-30
|
||||
c-1.6-2.6-5.8-4.2-12.1-7.4c-6.3-3.2-37.3-18.4-43.1-20.5c-5.8-2.1-10-3.2-14.2,3.2c-4.2,6.3-16.3,20.5-20,24.7s-7.4,4.7-13.7,1.6
|
||||
c-6.3-3.2-26.6-9.8-50.7-31.3c-18.8-16.7-31.4-37.4-35.1-43.7c-3.7-6.3-0.4-9.7,2.8-12.9c2.8-2.8,6.3-7.4,9.5-11.1
|
||||
c3.2-3.7,4.2-6.3,6.3-10.5c2.1-4.2,1.1-7.9-0.5-11.1C210.5,190.6,198.3,159.4,192.7,146.9"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><path d="m143.8 431.2 7.7 4.5c32.2 19.1 69.2 29.2 106.8 29.2h.1c115.7 0 209.8-94.1 209.9-209.8 0-56.1-21.8-108.8-61.4-148.4-39.3-39.5-92.7-61.7-148.4-61.5-115.8 0-209.9 94.1-210 209.8-.1 39.5 11.1 78.2 32.1 111.7l5 7.9L64.4 452zM3.7 512l35.8-130.8C17.5 342.9 5.8 299.5 5.9 255 5.9 115.8 119.2 2.6 258.4 2.6c67.5 0 130.9 26.3 178.6 74s73.9 111.1 73.9 178.6c-.1 139.2-113.3 252.4-252.5 252.4h-.1c-42.3 0-83.8-10.6-120.7-30.7z" style="fill:#b3b3b3"/><path d="M1.1 509.4 37 378.6C14.8 340.2 3.2 296.7 3.3 252.4 3.3 113.2 116.6 0 255.8 0c67.5 0 130.9 26.3 178.6 74s73.9 111.1 73.9 178.6C508.2 391.8 394.9 505 255.8 505h-.1c-42.3 0-83.8-10.6-120.7-30.7z" style="fill:#fff"/><path d="M255.8 42.6c-115.8 0-209.9 94.1-210 209.8 0 39.5 11.2 78.2 32.2 111.7l5 7.9-21.2 77.4 79.4-20.8 7.7 4.5c32.2 19.1 69.2 29.2 106.8 29.3h.1c115.7 0 209.8-94.1 209.9-209.8.2-55.7-21.9-109.1-61.4-148.4-39.3-39.5-92.8-61.7-148.5-61.6" style="fill:none"/><linearGradient id="a" x1="254.666" x2="256.793" y1="446.637" y2="87.926" gradientTransform="matrix(1 0 0 -1 0 514.448)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#57d163"/><stop offset="1" style="stop-color:#23b33a"/></linearGradient><path d="M255.8 42.6c-115.8 0-209.9 94.1-210 209.8 0 39.5 11.2 78.2 32.2 111.7l5 7.9-21.2 77.4 79.4-20.8 7.7 4.5c32.2 19.1 69.2 29.2 106.8 29.2h.1c115.7 0 209.8-94.1 209.9-209.8.2-55.7-21.9-109.1-61.4-148.4-39.3-39.4-92.8-61.6-148.5-61.5" style="fill:url(#a)"/><path d="M192.7 146.9c-4.7-10.5-9.7-10.7-14.2-10.9l-12.1-.1c-4.2 0-11 1.6-16.8 7.9s-22.1 21.6-22.1 52.6 22.6 61 25.8 65.2 43.6 69.9 107.8 95.2c53.3 21 64.1 16.8 75.7 15.8 11.6-1.1 37.3-15.3 42.6-30s5.3-27.4 3.7-30-5.8-4.2-12.1-7.4-37.3-18.4-43.1-20.5-10-3.2-14.2 3.2c-4.2 6.3-16.3 20.5-20 24.7s-7.4 4.7-13.7 1.6c-6.3-3.2-26.6-9.8-50.7-31.3-18.8-16.7-31.4-37.4-35.1-43.7s-.4-9.7 2.8-12.9c2.8-2.8 6.3-7.4 9.5-11.1s4.2-6.3 6.3-10.5 1.1-7.9-.5-11.1c-1.8-3-14-34.2-19.6-46.7" style="fill-rule:evenodd;clip-rule:evenodd;fill:#fff"/></svg>
|
||||
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.0 KiB |
Reference in New Issue
Block a user