fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="svg3858" version="1.1" viewBox="50 50 900 947.09"><metadata id="metadata3863"/><g id="layer1" transform="translate(-23.868215,305.62409)"><g id="g3928" transform="matrix(15.504137,0,0,15.504137,-5866.0511,-7379.7381)"><path id="path3307" d="m 440.45789,488.69519 c 0,0 -14.08691,-26.23902 -14.08691,-26.23902 -1.48437,-2.75878 -4.88404,-3.76831 -7.59765,-2.25586 0,0 -25.78247,14.375 -25.78247,14.375 -1.16089,0.66406 -2.24365,1.82374 -2.73682,3.4668 0,0 -6.91895,24.02954 -6.91895,24.02954 -0.82886,2.87354 0.79224,5.88746 3.62183,6.73219 0,0 40.64454,11.56005 40.64454,11.56005 2.82715,0.84228 5.79345,-0.8081 6.62352,-3.6853 0,0 6.72364,-23.56202 6.72364,-23.56202 0.43701,-1.38305 0.19165,-3.0896 -0.49073,-4.42138 z" style="fill:#00a0e2;fill-opacity:1;fill-rule:nonzero;stroke:none"/><path id="path3309" d="m 408.86244,493.74646 c 0,0 -4.47022,-8.71704 -7.35962,-8.71704 -2.23999,0.002 -2.43409,2.36817 -2.42798,8.07007 0.009,5.70435 0.31617,7.92602 2.42065,7.92602 2.86012,-0.002 7.36695,-7.27905 7.36695,-7.27905 z m 5.74707,-7.27295 c 2.29003,-3.29712 4.36035,-6.56127 8.23242,-6.56127 4.28712,-0.002 6.61012,3.58642 6.62475,6.60643 0,0.0305 -0.0183,19.3335 -0.0183,19.3335 0,0 -4.81446,0 -4.81446,0 0,0 -0.0208,-18.30078 -0.0208,-18.30078 0,-2.51343 -2.02026,-2.50854 -2.04834,-2.50854 -1.62841,0 -4.62159,4.08325 -7.95289,8.61694 0,0 0,12.19971 0,12.19971 0,0 -4.86816,0.005 -4.86816,0.005 0,0 -0.006,-5.64696 -0.006,-5.64696 0,0 -3.21899,5.64696 -8.03832,5.65307 -5.46754,10e-4 -7.323,-3.75855 -7.33643,-12.7649 -0.009,-8.58032 1.20849,-13.17139 7.06909,-13.17626 4.45801,-0.004 8.28735,6.4917 8.28735,6.4917 0,0 10e-4,-4.11378 10e-4,-4.11378 0,0 4.89135,-6.58813 4.89135,-6.58813 0,0 -0.0208,10.78003 -0.002,10.7544 z" style="fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:none"/></g></g></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="50 50 900 947.09"><path d="m440.458 488.695-14.087-26.239c-1.484-2.759-4.884-3.768-7.598-2.256l-25.782 14.375a5.94 5.94 0 0 0-2.737 3.467l-6.919 24.03c-.829 2.873.792 5.887 3.622 6.732l40.644 11.56c2.828.842 5.794-.808 6.624-3.685l6.724-23.562c.437-1.383.191-3.09-.491-4.422" style="fill:#00a0e2;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(15.50414 0 0 15.50414 -5889.92 -7074.114)"/><path d="M408.862 493.746s-4.47-8.717-7.36-8.717c-2.24.002-2.433 2.369-2.427 8.07.009 5.705.316 7.927 2.42 7.927 2.86-.002 7.367-7.28 7.367-7.28m5.748-7.272c2.29-3.298 4.36-6.562 8.232-6.562 4.287-.002 6.61 3.587 6.625 6.607l-.019 19.333h-4.814l-.02-18.3c0-2.514-2.021-2.51-2.05-2.51-1.628 0-4.62 4.084-7.952 8.618v12.2l-4.868.005-.006-5.647s-3.22 5.647-8.039 5.653c-5.467 0-7.323-3.759-7.336-12.765-.009-8.58 1.208-13.172 7.07-13.177 4.457-.004 8.286 6.492 8.286 6.492l.001-4.114 4.892-6.588s-.021 10.78-.002 10.755z" style="fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(15.50414 0 0 15.50414 -5889.92 -7074.114)"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.1 KiB |
Reference in New Issue
Block a user