fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1,22 +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:#4E5E9E;}
|
||||
.st1{fill:#FDB933;}
|
||||
</style>
|
||||
<g id="brandmark">
|
||||
<g>
|
||||
<path class="st0" d="M256.3,512C115.2,512,0,396.8,0,255.7S115.2,0,256.3,0c34.1,0,67,6.5,98.4,19.5c8.7,3.8,13,14.1,9.2,22.7
|
||||
c-3.8,8.7-14.1,13-22.7,9.2c-27-11.4-55.7-16.8-85.4-16.8c-122.2,0-221.7,99.5-221.7,221.7s99.5,221.7,221.7,221.7
|
||||
s221.7-99.5,221.7-221.7c0-26-4.3-51.9-13.5-76.2c-3.2-9.2,1.1-18.9,10.3-22.2c9.2-3.2,18.9,1.1,22.2,10.3
|
||||
c10.3,28.1,15.7,57.8,15.7,88.1C512.5,397.4,397.4,512,256.3,512z"/>
|
||||
</g>
|
||||
<g>
|
||||
<polygon class="st1" points="368.2,229.8 328.7,271.4 350.9,363.9 400.6,363.9 "/>
|
||||
</g>
|
||||
<polygon class="st1" points="352,107.6 366,121.1 256.3,237.3 162.7,140.6 108.7,363.9 159,363.9 188.7,240.1 256.3,314.1
|
||||
401.2,156.2 414.7,169.8 428.7,91.9 "/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 512 512"><style>.st1{fill:#fdb933}</style><g id="brandmark"><path d="M256.3 512C115.2 512 0 396.8 0 255.7S115.2 0 256.3 0c34.1 0 67 6.5 98.4 19.5 8.7 3.8 13 14.1 9.2 22.7-3.8 8.7-14.1 13-22.7 9.2-27-11.4-55.7-16.8-85.4-16.8-122.2 0-221.7 99.5-221.7 221.7S133.6 478 255.8 478s221.7-99.5 221.7-221.7c0-26-4.3-51.9-13.5-76.2-3.2-9.2 1.1-18.9 10.3-22.2 9.2-3.2 18.9 1.1 22.2 10.3 10.3 28.1 15.7 57.8 15.7 88.1.3 141.1-114.8 255.7-255.9 255.7" style="fill:#4e5e9e"/><path d="m368.2 229.8-39.5 41.6 22.2 92.5h49.7zM352 107.6l14 13.5-109.7 116.2-93.6-96.7-54 223.3H159l29.7-123.8 67.6 74 144.9-157.9 13.5 13.6 14-77.9z" class="st1"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 749 B |
Reference in New Issue
Block a user