fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
+1
-22
@@ -1,22 +1 @@
|
||||
<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="svg5" x="0px" y="0px" style="enable-background:new 0 0 512 512;" xml:space="preserve" viewBox="-0.19 20.32 512.59 471.09">
|
||||
<style type="text/css">
|
||||
|
||||
.st0{fill:url(#path239_00000043446023028225557990000013184206957103615910_);stroke:url(#path239_00000115503470906943489770000001101333908688582045_);stroke-width:0.394;stroke-miterlimit:11.3386;}
|
||||
</style>
|
||||
<sodipodi:namedview bordercolor="#000000" borderopacity="0.25" id="namedview7" inkscape:current-layer="layer1" inkscape:cx="371.03994" inkscape:cy="273.62644" inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" inkscape:pagecheckerboard="0" inkscape:pageopacity="0.0" inkscape:showpageshadow="2" inkscape:window-height="1427" inkscape:window-maximized="1" inkscape:window-width="2256" inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="2.4175295" pagecolor="#ffffff" showgrid="false">
|
||||
</sodipodi:namedview>
|
||||
<g id="layer1" transform="translate(-30.394373,-54.680428)" inkscape:groupmode="layer" inkscape:label="Layer 1">
|
||||
|
||||
<linearGradient id="path239_00000090999287302923618650000003594179488775458706_" gradientUnits="userSpaceOnUse" x1="78.1205" y1="580.8818" x2="183.9045" y2="458.9372" gradientTransform="matrix(2.8346 0 0 -2.8346 -51.3242 1765.0641)">
|
||||
<stop offset="0" style="stop-color:#9B58DC"/>
|
||||
<stop offset="1" style="stop-color:#321C92"/>
|
||||
</linearGradient>
|
||||
|
||||
<linearGradient id="path239_00000142144938522694179990000002627605764604699292_" gradientUnits="userSpaceOnUse" x1="78.3906" y1="580.5706" x2="183.6456" y2="459.2357" gradientTransform="matrix(2.8346 0 0 -2.8346 -51.3242 1765.0641)">
|
||||
<stop offset="0" style="stop-color:#9B58DC"/>
|
||||
<stop offset="1" style="stop-color:#321C92"/>
|
||||
</linearGradient>
|
||||
|
||||
<path id="path239" style="fill:url(#path239_00000090999287302923618650000003594179488775458706_);stroke:url(#path239_00000142144938522694179990000002627605764604699292_);stroke-width:0.394;stroke-miterlimit:11.3386;" d=" M380.1,542.6c-6.5-3.4-44.3-24.4-221.4-122.7c-49.3-27.4-96.8-53.7-105.5-58.5c-19.8-10.9-22.8-13.6-22.8-20.1 c0-3.4,7.9-25.4,26.4-73.5c14.5-37.7,27.4-70.8,28.5-73.5c2.7-6.1,7-11.3,11.2-13.5c3.9-2,102.4-38,107.5-39.2 c5.4-1.3,10.1,1.2,12.9,7.1c1.3,2.8,6.8,17.2,12.2,32.1c5.4,14.9,13.4,36.8,17.9,48.8c10.1,27.5,10.5,31.4,3.5,35.5 c-1.9,1.1-14.1,5.9-27.1,10.6c-13,4.7-25.4,9.6-27.6,10.9c-5,2.9-5.7,7.4-1.8,11c1.6,1.4,26.6,15.7,55.6,31.7 c81.2,44.8,76.7,42.7,82.1,36.9c2.7-2.9,51.1-126.2,53.9-137.2c1.2-4.7,1.1-5.3-1.5-7.4c-3.5-2.8-3-2.9-34.8,8.3 c-31.6,11.2-34.6,11.4-38.8,3.1c-2.2-4.4-36.2-97.8-38.3-105.3c-1.4-4.9,0.3-9.5,4.4-12.2c1.7-1.1,26.5-10.6,55-21.1 c42.4-15.6,53.1-19.1,58.7-19.2c7.1-0.1,8,0.4,138.4,72.5c9,5,13.9,10.3,13.9,15.1c0,1.9-32.3,87.7-71.8,190.5 c-55.7,145.1-72.5,187.6-75,189.8C391.5,547,388.1,546.8,380.1,542.6L380.1,542.6z"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="-0.19 20.32 512.59 471.09"><g transform="translate(-30.394 -54.68)"><linearGradient id="a" x1="78.121" x2="183.905" y1="580.882" y2="458.937" gradientTransform="matrix(2.8346 0 0 -2.8346 -51.324 1765.064)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#9b58dc"/><stop offset="1" style="stop-color:#321c92"/></linearGradient><linearGradient id="b" x1="78.391" x2="183.646" y1="580.571" y2="459.236" gradientTransform="matrix(2.8346 0 0 -2.8346 -51.324 1765.064)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#9b58dc"/><stop offset="1" style="stop-color:#321c92"/></linearGradient><path d="M380.1 542.6c-6.5-3.4-44.3-24.4-221.4-122.7-49.3-27.4-96.8-53.7-105.5-58.5-19.8-10.9-22.8-13.6-22.8-20.1 0-3.4 7.9-25.4 26.4-73.5 14.5-37.7 27.4-70.8 28.5-73.5 2.7-6.1 7-11.3 11.2-13.5 3.9-2 102.4-38 107.5-39.2 5.4-1.3 10.1 1.2 12.9 7.1 1.3 2.8 6.8 17.2 12.2 32.1s13.4 36.8 17.9 48.8c10.1 27.5 10.5 31.4 3.5 35.5-1.9 1.1-14.1 5.9-27.1 10.6s-25.4 9.6-27.6 10.9c-5 2.9-5.7 7.4-1.8 11 1.6 1.4 26.6 15.7 55.6 31.7 81.2 44.8 76.7 42.7 82.1 36.9 2.7-2.9 51.1-126.2 53.9-137.2 1.2-4.7 1.1-5.3-1.5-7.4-3.5-2.8-3-2.9-34.8 8.3-31.6 11.2-34.6 11.4-38.8 3.1-2.2-4.4-36.2-97.8-38.3-105.3-1.4-4.9.3-9.5 4.4-12.2 1.7-1.1 26.5-10.6 55-21.1 42.4-15.6 53.1-19.1 58.7-19.2 7.1-.1 8 .4 138.4 72.5 9 5 13.9 10.3 13.9 15.1 0 1.9-32.3 87.7-71.8 190.5-55.7 145.1-72.5 187.6-75 189.8-4.3 3.9-7.7 3.7-15.7-.5z" style="fill:url(#a);stroke:url(#b);stroke-width:.394;stroke-miterlimit:11.3386"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 1.5 KiB |
Reference in New Issue
Block a user