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" xmlns:xlink="http://www.w3.org/1999/xlink" id="svg2" width="707" height="500" version="1.1" viewBox="20.52 9 327.754 222"><a id="a2" xlink:href="http://free.arinco.org/mail/mailfence/"><path id="path1" fill="#2b81bd" d="m 322.5,9.117 c -0.117,0.226 -0.217,0.457 -0.352,0.68 L 233.35,163.6 c -3.082,5.344 -8.678,8.332 -14.432,8.332 a 16.61,16.61 0 0 1 -8.314,-2.232 c -7.957,-4.6 -10.688,-14.783 -6.094,-22.746 L 284.162,9 H 86.297 L 124.195,69.65 105.334,102.31 47.063,9.062 C 32.361,9.703 20.52,21.894 20.52,36.75 v 166.5 c 0,14.49 11.262,26.461 25.471,27.633 0.117,-0.229 0.217,-0.457 0.346,-0.68 L 135.136,76.397 c 4.6,-7.966 14.783,-10.693 22.746,-6.097 7.963,4.6 10.693,14.78 6.094,22.746 L 84.328,231 h 197.865 l -37.805,-60.498 18.855,-32.666 58.178,93.105 c 14.707,-0.645 26.549,-12.838 26.549,-27.691 V 36.75 C 347.971,22.257 336.703,10.289 322.5,9.117 Z M 163.418,172.699 a 16.61,16.61 0 0 1 -8.314,-2.232 c -7.963,-4.6 -10.688,-14.783 -6.094,-22.746 l 41.625,-72.094 c 4.6,-7.966 14.789,-10.69 22.746,-6.094 7.963,4.597 10.693,14.78 6.094,22.743 l -41.625,72.097 c -3.082,5.344 -8.678,8.326 -14.432,8.326 z"/></a></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="707" height="500" viewBox="20.52 9 327.754 222"><a xlink:href="http://free.arinco.org/mail/mailfence/"><path fill="#2b81bd" d="M322.5 9.117c-.117.226-.217.457-.352.68L233.35 163.6c-3.082 5.344-8.678 8.332-14.432 8.332a16.6 16.6 0 0 1-8.314-2.232c-7.957-4.6-10.688-14.783-6.094-22.746L284.162 9H86.297l37.898 60.65-18.861 32.66L47.063 9.062C32.361 9.703 20.52 21.894 20.52 36.75v166.5c0 14.49 11.262 26.461 25.471 27.633.117-.229.217-.457.346-.68l88.799-153.806c4.6-7.966 14.783-10.693 22.746-6.097 7.963 4.6 10.693 14.78 6.094 22.746L84.328 231h197.865l-37.805-60.498 18.855-32.666 58.178 93.105c14.707-.645 26.549-12.838 26.549-27.691V36.75c.001-14.493-11.267-26.461-25.47-27.633M163.418 172.699a16.6 16.6 0 0 1-8.314-2.232c-7.963-4.6-10.688-14.783-6.094-22.746l41.625-72.094c4.6-7.966 14.789-10.69 22.746-6.094 7.963 4.597 10.693 14.78 6.094 22.743l-41.625 72.097c-3.082 5.344-8.678 8.326-14.432 8.326"/></a></svg>
|
||||
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1006 B |
Reference in New Issue
Block a user