fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1,21 +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-rule:evenodd;clip-rule:evenodd;fill:#4F46E5;}
|
||||
</style>
|
||||
<g>
|
||||
<path class="st0" d="M44.5,0C19.9,0,0,19.9,0,44.5v423C0,492.1,19.9,512,44.5,512h423c24.6,0,44.5-19.9,44.5-44.5v-423
|
||||
C512,19.9,492.1,0,467.5,0H44.5z M465.5,116.3H46.5v349.1h418.9V116.3z M400.7,66.8c0.1,3-0.4,6-1.5,8.8c-1.1,2.8-2.7,5.3-4.8,7.5
|
||||
c-2.1,2.2-4.6,3.9-7.3,5c-2.8,1.2-5.7,1.8-8.7,1.8c-3,0-6-0.6-8.7-1.8c-2.8-1.2-5.2-2.9-7.3-5c-2.1-2.2-3.7-4.7-4.8-7.5
|
||||
c-1.1-2.8-1.6-5.8-1.5-8.8c0.2-5.8,2.6-11.2,6.8-15.2c4.2-4,9.7-6.2,15.5-6.2c5.8,0,11.3,2.2,15.5,6.2
|
||||
C398.1,55.6,400.5,61,400.7,66.8z M111.3,89c3,0.1,6-0.4,8.8-1.5c2.8-1.1,5.3-2.7,7.5-4.8c2.2-2.1,3.9-4.6,5-7.3
|
||||
c1.2-2.8,1.8-5.7,1.8-8.7c0-3-0.6-6-1.8-8.7c-1.2-2.8-2.9-5.2-5-7.3c-2.2-2.1-4.7-3.7-7.5-4.8c-2.8-1.1-5.8-1.6-8.8-1.5
|
||||
c-5.8,0.2-11.2,2.6-15.2,6.8c-4,4.2-6.2,9.7-6.2,15.5c0,5.8,2.2,11.3,6.2,15.5C100.1,86.4,105.5,88.8,111.3,89z M141.5,297.2
|
||||
c-1-1-1.9-2.3-2.4-3.6c-0.6-1.4-0.8-2.8-0.8-4.3c0-1.5,0.3-2.9,0.8-4.3c0.6-1.3,1.4-2.6,2.4-3.6l15.7-15.7c1-1,2.3-1.9,3.6-2.4
|
||||
c1.3-0.6,2.8-0.8,4.3-0.8s2.9,0.3,4.3,0.8c1.3,0.6,2.6,1.4,3.6,2.4l56.1,56.1L352,199c1-1,2.3-1.9,3.6-2.4c1.4-0.6,2.8-0.8,4.3-0.8
|
||||
c1.5,0,2.9,0.3,4.3,0.8s2.6,1.4,3.6,2.4l15.8,15.7c2.1,2.1,3.3,4.9,3.3,7.9c0,3-1.2,5.8-3.3,7.9L237,376.9c-1,1-2.3,1.9-3.6,2.4
|
||||
c-1.3,0.6-2.8,0.8-4.3,0.8c-1.5,0-2.9-0.3-4.3-0.8c-1.3-0.6-2.6-1.4-3.6-2.4L141.5,297.2z"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 512 512"><path d="M44.5 0C19.9 0 0 19.9 0 44.5v423C0 492.1 19.9 512 44.5 512h423c24.6 0 44.5-19.9 44.5-44.5v-423C512 19.9 492.1 0 467.5 0zm421 116.3h-419v349.1h418.9V116.3zm-64.8-49.5c.1 3-.4 6-1.5 8.8q-1.65 4.2-4.8 7.5c-2.1 2.2-4.6 3.9-7.3 5q-4.2 1.8-8.7 1.8c-3 0-6-.6-8.7-1.8-2.8-1.2-5.2-2.9-7.3-5q-3.15-3.3-4.8-7.5c-1.1-2.8-1.6-5.8-1.5-8.8.2-5.8 2.6-11.2 6.8-15.2s9.7-6.2 15.5-6.2 11.3 2.2 15.5 6.2 6.6 9.4 6.8 15.2M111.3 89c3 .1 6-.4 8.8-1.5q4.2-1.65 7.5-4.8c2.2-2.1 3.9-4.6 5-7.3q1.8-4.2 1.8-8.7c0-3-.6-6-1.8-8.7-1.2-2.8-2.9-5.2-5-7.3q-3.3-3.15-7.5-4.8c-2.8-1.1-5.8-1.6-8.8-1.5-5.8.2-11.2 2.6-15.2 6.8s-6.2 9.7-6.2 15.5 2.2 11.3 6.2 15.5 9.4 6.6 15.2 6.8m30.2 208.2c-1-1-1.9-2.3-2.4-3.6-.6-1.4-.8-2.8-.8-4.3s.3-2.9.8-4.3c.6-1.3 1.4-2.6 2.4-3.6l15.7-15.7c1-1 2.3-1.9 3.6-2.4 1.3-.6 2.8-.8 4.3-.8s2.9.3 4.3.8c1.3.6 2.6 1.4 3.6 2.4l56.1 56.1L352 199c1-1 2.3-1.9 3.6-2.4 1.4-.6 2.8-.8 4.3-.8s2.9.3 4.3.8 2.6 1.4 3.6 2.4l15.8 15.7c2.1 2.1 3.3 4.9 3.3 7.9s-1.2 5.8-3.3 7.9L237 376.9c-1 1-2.3 1.9-3.6 2.4-1.3.6-2.8.8-4.3.8s-2.9-.3-4.3-.8c-1.3-.6-2.6-1.4-3.6-2.4z" style="fill-rule:evenodd;clip-rule:evenodd;fill:#4f46e5"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.2 KiB |
Reference in New Issue
Block a user