fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1,19 +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="82 0 348 512">
|
||||
<style type="text/css">
|
||||
.st0{fill:url(#SVGID_1_);}
|
||||
.st1{fill:#91180C;}
|
||||
.st2{fill:#F42E1C;}
|
||||
</style>
|
||||
<g>
|
||||
|
||||
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="313.659" y1="62.878" x2="1028.9639" y2="62.878" gradientTransform="matrix(0.3694 0 0 -0.3694 -23.2119 102.2378)">
|
||||
<stop offset="0" style="stop-color:#12B212"/>
|
||||
<stop offset="1" style="stop-color:#00FF00"/>
|
||||
</linearGradient>
|
||||
<path class="st0" d="M226.1,157.3C162.1,150.5,97.7,102.2,92.7,0C191.8,0,244.9,58.7,250,151.8c18.8-111.6,106.7-98.5,106.7-98.5 c4.2,63.2-47.8,101.6-106.7,104.8C233.5,123.1,134.3,37.6,134.3,37.6c-0.1-0.1-0.3-0.1-0.4,0c-0.1,0.1-0.1,0.2,0,0.3 C133.9,37.9,229.6,121.3,226.1,157.3"/>
|
||||
<path class="st1" d="M256,512c-6.2-0.4-63.9-2.6-67.4-67.4c-2.8-39.4,28.3-68.5,28.3-106.7c-7.1-95.4-134.9-83.6-134.9,0 c-0.1,20.9,8.2,40.9,23,55.7l95.2,95.3c14.8,14.8,34.8,23,55.7,23"/>
|
||||
<path class="st2" d="M430,337.9c-0.4,6.2-2.6,63.9-67.4,67.4c-39.4,2.8-68.5-28.3-106.7-28.3c-95.4,7.1-83.6,134.8,0,134.8 c20.9,0.1,40.9-8.2,55.7-23l95.3-95.2c14.8-14.8,23-34.8,23-55.7"/>
|
||||
<path class="st1" d="M256,163.9c6.2,0.4,63.9,2.6,67.4,67.4c2.8,39.4-28.3,68.5-28.3,106.7c7.1,95.4,134.8,83.6,134.8,0 c0.1-20.9-8.2-40.9-23-55.7L311.7,187c-14.8-14.8-34.8-23-55.7-23"/>
|
||||
<path class="st2" d="M82.3,337.9c0.4-6.2,2.6-63.9,67.4-67.4c39.4-2.8,68.5,28.3,106.7,28.3c95.4-7.2,83.6-134.8,0-134.8 c-20.9-0.1-40.9,8.2-55.7,23l-95.3,95.3c-14.8,14.8-23,34.8-23,55.7"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Layer_1" x="0" y="0" version="1.1" viewBox="82 0 348 512"><style>.st1{fill:#91180c}.st2{fill:#f42e1c}</style><linearGradient id="SVGID_1_" x1="313.659" x2="1028.964" y1="62.878" y2="62.878" gradientTransform="matrix(.3694 0 0 -.3694 -23.212 102.238)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#12b212"/><stop offset="1" style="stop-color:#0f0"/></linearGradient><path d="M226.1 157.3C162.1 150.5 97.7 102.2 92.7 0 191.8 0 244.9 58.7 250 151.8c18.8-111.6 106.7-98.5 106.7-98.5 4.2 63.2-47.8 101.6-106.7 104.8-16.5-35-115.7-120.5-115.7-120.5-.1-.1-.3-.1-.4 0q-.15.15 0 .3s95.7 83.4 92.2 119.4" style="fill:url(#SVGID_1_)"/><path d="M256 512c-6.2-.4-63.9-2.6-67.4-67.4-2.8-39.4 28.3-68.5 28.3-106.7-7.1-95.4-134.9-83.6-134.9 0-.1 20.9 8.2 40.9 23 55.7l95.2 95.3c14.8 14.8 34.8 23 55.7 23" class="st1"/><path d="M430 337.9c-.4 6.2-2.6 63.9-67.4 67.4-39.4 2.8-68.5-28.3-106.7-28.3-95.4 7.1-83.6 134.8 0 134.8 20.9.1 40.9-8.2 55.7-23l95.3-95.2c14.8-14.8 23-34.8 23-55.7" class="st2"/><path d="M256 163.9c6.2.4 63.9 2.6 67.4 67.4 2.8 39.4-28.3 68.5-28.3 106.7 7.1 95.4 134.8 83.6 134.8 0 .1-20.9-8.2-40.9-23-55.7L311.7 187c-14.8-14.8-34.8-23-55.7-23" class="st1"/><path d="M82.3 337.9c.4-6.2 2.6-63.9 67.4-67.4 39.4-2.8 68.5 28.3 106.7 28.3 95.4-7.2 83.6-134.8 0-134.8-20.9-.1-40.9 8.2-55.7 23l-95.3 95.3c-14.8 14.8-23 34.8-23 55.7" class="st2"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.4 KiB |
Reference in New Issue
Block a user