fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1,20 +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:#FFFFFF;}
|
||||
.st1{fill:#1D1D1D;}
|
||||
</style>
|
||||
<rect x="74.5" y="88" class="st0" width="376" height="323"/>
|
||||
<g>
|
||||
<path class="st1" d="M450.9,0H61.1C27.3,0,0,27.3,0,61.1v389.8C0,484.7,27.3,512,61.1,512h389.8c33.8,0,61.1-27.3,61.1-61.1V61.1
|
||||
C512,27.3,484.7,0,450.9,0z M387,260.5c-4.1,11.8-11,29.3-21.2,45.8c-10.8,17.7-22.8,29.9-35.4,36c-6.5,3.3-13.2,4.9-20,4.9
|
||||
c-2.6,0-5.3-0.2-7.7-0.8c-9.4-1.8-18.3-6.5-26.5-14.5c-14.3-13.8-26.5-37.3-37.7-71.9c-11.2-34.8-21.4-49.5-27.9-55.8
|
||||
c-3.3-3.1-5.3-3.9-6.3-4.1c-0.6,0-1.6,0-3.7,0.8c-5.7,2.6-12.8,10.4-19.8,21.4c-6.7,10.6-13.2,24-18.3,38.3
|
||||
c-3.7,10.2-14.9,15.5-25.3,11.8c-5.1-1.8-9.2-5.3-11.4-10.2c-2.2-4.7-2.4-10-0.8-14.9c4.3-11.8,11.6-29.3,22-45.8
|
||||
c11.2-17.7,23.4-29.7,36.3-35.8c9.2-4.3,18.5-5.7,27.9-4.1c9.6,1.6,18.5,6.5,26.7,14.3c14.5,13.8,26.9,37.5,38.1,72.1
|
||||
c11.2,34.8,21.2,49.7,27.7,55.8c3.3,3.3,5.3,3.9,5.9,3.9c0.4,0,1.2,0.2,3.1-0.8c5.5-2.6,12.4-10.4,18.9-21.2
|
||||
c6.5-10.6,12.6-24.2,17.5-38.3c3.5-10.2,14.7-15.7,25.1-12.2c5.1,1.6,9.2,5.3,11.6,10c2.2,4.7,2.6,10,1,14.9L387,260.5z"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><path d="M74.5 88h376v323h-376z" style="fill:#fff"/><path d="M450.9 0H61.1C27.3 0 0 27.3 0 61.1v389.8C0 484.7 27.3 512 61.1 512h389.8c33.8 0 61.1-27.3 61.1-61.1V61.1C512 27.3 484.7 0 450.9 0M387 260.5c-4.1 11.8-11 29.3-21.2 45.8-10.8 17.7-22.8 29.9-35.4 36-6.5 3.3-13.2 4.9-20 4.9-2.6 0-5.3-.2-7.7-.8-9.4-1.8-18.3-6.5-26.5-14.5-14.3-13.8-26.5-37.3-37.7-71.9-11.2-34.8-21.4-49.5-27.9-55.8-3.3-3.1-5.3-3.9-6.3-4.1-.6 0-1.6 0-3.7.8-5.7 2.6-12.8 10.4-19.8 21.4-6.7 10.6-13.2 24-18.3 38.3-3.7 10.2-14.9 15.5-25.3 11.8-5.1-1.8-9.2-5.3-11.4-10.2-2.2-4.7-2.4-10-.8-14.9 4.3-11.8 11.6-29.3 22-45.8 11.2-17.7 23.4-29.7 36.3-35.8 9.2-4.3 18.5-5.7 27.9-4.1 9.6 1.6 18.5 6.5 26.7 14.3 14.5 13.8 26.9 37.5 38.1 72.1 11.2 34.8 21.2 49.7 27.7 55.8 3.3 3.3 5.3 3.9 5.9 3.9.4 0 1.2.2 3.1-.8 5.5-2.6 12.4-10.4 18.9-21.2 6.5-10.6 12.6-24.2 17.5-38.3 3.5-10.2 14.7-15.7 25.1-12.2 5.1 1.6 9.2 5.3 11.6 10 2.2 4.7 2.6 10 1 14.9z" style="fill:#1d1d1d"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1018 B |
Reference in New Issue
Block a user