fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1,26 +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:#00832D;}
|
||||
.st1{fill:#34A853;}
|
||||
</style>
|
||||
<g>
|
||||
<g>
|
||||
<path class="st0" d="M269.7,102.4v122.9c0,7.6,6.1,13.7,13.7,13.7h122.9c0-37.7-8.4-78.6-33.2-103.4
|
||||
C348.3,110.8,307.3,102.4,269.7,102.4z"/>
|
||||
<path class="st0" d="M403.6,509.5c-57.3,9.4-126.8-7.6-193.3-47.3l22.3-49.8l50.6-23.3l79.2,45.3L403.6,509.5z"/>
|
||||
<path class="st0" d="M5.9,111.8c-9.4,57.3,7.4,126.8,47.3,193.3l51.2-24l21.9-49.1l-43-70.2L5.9,111.8z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path class="st1" d="M290.1,0c-11.3,0-20.5,9.2-20.5,20.5v81.9c75.4,0,136.6,61.2,136.6,136.6h81.9c11.3,0,20.5-9.2,20.5-20.5
|
||||
C508.6,97.9,410.8,0,290.1,0z"/>
|
||||
<path class="st1" d="M489.2,462.4c10.9-10.4,11.3-27.4,1-38.3l-98.7-105.3c-10.9-10.2-27.6-10-38.1,0.4l-70,69.8l120.2,120.2
|
||||
c32.6-4.7,56.9-18.6,79-40.7L489.2,462.4z"/>
|
||||
<path class="st1" d="M53.4,305.1c18,29.9,42,60,69.2,87.2s57.9,51.6,87.8,69.6l73.1-72.9L126.3,232"/>
|
||||
<path class="st1" d="M179,181L179,181l11.3-10.9c13.3-13.3,13.3-35.2,0-48.5L97.5,28.9c-13.3-13.3-35.2-13.3-48.5,0l-3.3,2.3
|
||||
C24.2,52.6,11.3,80.5,5.9,111.8L126.3,232L179,181z"/>
|
||||
</g>
|
||||
</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>.st0{fill:#00832d}.st1{fill:#34a853}</style><path d="M269.7 102.4v122.9c0 7.6 6.1 13.7 13.7 13.7h122.9c0-37.7-8.4-78.6-33.2-103.4s-65.8-33.2-103.4-33.2M403.6 509.5c-57.3 9.4-126.8-7.6-193.3-47.3l22.3-49.8 50.6-23.3 79.2 45.3zM5.9 111.8c-9.4 57.3 7.4 126.8 47.3 193.3l51.2-24 21.9-49.1-43-70.2z" class="st0"/><path d="M290.1 0c-11.3 0-20.5 9.2-20.5 20.5v81.9c75.4 0 136.6 61.2 136.6 136.6h81.9c11.3 0 20.5-9.2 20.5-20.5C508.6 97.9 410.8 0 290.1 0M489.2 462.4a27.05 27.05 0 0 0 1-38.3l-98.7-105.3c-10.9-10.2-27.6-10-38.1.4l-70 69.8 120.2 120.2c32.6-4.7 56.9-18.6 79-40.7z" class="st1"/><path d="M53.4 305.1c18 29.9 42 60 69.2 87.2s57.9 51.6 87.8 69.6l73.1-72.9-157.2-157M179 181l11.3-10.9c13.3-13.3 13.3-35.2 0-48.5L97.5 28.9c-13.3-13.3-35.2-13.3-48.5 0l-3.3 2.3C24.2 52.6 11.3 80.5 5.9 111.8L126.3 232z" class="st1"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 951 B |
Reference in New Issue
Block a user