fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1,30 +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:#0076FF;}
|
||||
.st1{fill:#52AEFF;}
|
||||
</style>
|
||||
<g>
|
||||
<path class="st0" d="M240,474c-15.6-24.9-17.8-28.1-22.1-33.1c-2.8-3.3-12.1-12.5-16-16c-16.1-14.2-32.5-26-64.5-46.5
|
||||
c-12.8-8.2-27.2-18.9-38.6-28.7c-8.6-7.3-21.6-19.9-28.7-27.8C24,270.9,0,210.9,0,146.5c0-36.8,7.7-72.6,22.8-106.2
|
||||
C27.7,29.6,37,12.4,37.8,12.8c3.7,2.2,60.8,37.1,60.8,37.3c0,0.1-1.1,2.1-2.4,4.4C75.8,90,67.8,131.7,73.6,172.2
|
||||
c7.2,50.7,37.1,97.4,85.5,133.7c7,5.2,11.6,8.4,20.7,14.3c19.2,12.3,30.2,19.9,43.7,29.9c12,9,19.7,15.3,31.2,25.6l1.4,1.3l1-0.9
|
||||
c23.7-21.4,40.8-33.8,76.9-57c40-25.7,69.5-56.9,87.2-92.3c15.4-30.7,21.6-64,18.3-98c-2.6-26.5-10.5-51.6-23.6-74.5
|
||||
c-1.3-2.2-2.3-4.1-2.3-4.2c0-0.1,2.3-1.6,5.1-3.2c5.9-3.6,54.7-33.4,55.5-33.9c0.5-0.3,0.6-0.2,2.6,3.2
|
||||
C500,55.9,512,100.4,512,146.6c0,61.5-22.3,119.7-64.5,168.8c-8.9,10.3-21,22.6-31.4,31.7c-14,12.3-27.2,22.1-46.2,34.3
|
||||
c-41.7,26.8-66.6,47-80,64.8c-1.1,1.5-9.1,14-17.9,27.9c-8.7,13.8-15.9,25.2-16,25.2C255.9,499.2,248.7,487.9,240,474L240,474z"/>
|
||||
<path class="st1" d="M250.1,308c-18.3-8.3-38-19.6-54.2-30.9c-22.6-15.8-39.3-31.9-50.4-48.4c-10.9-16.3-16-33.1-15.3-50.2
|
||||
c0.8-19.5,4.9-35.8,13.3-52.6c4.3-8.5,8.6-15.3,14.3-22.5C178.3,77.7,207.9,61,240.3,57c9.1-1.1,21.4-1.2,30.2-0.2
|
||||
c38.6,4.6,72.2,26.1,92.8,59.3c2.9,4.7,7.7,14.3,9.8,19.5c5.4,13.8,8.2,27.5,8.9,43.1c1.3,31.8-18,62.8-57.5,92.4
|
||||
c-14.5,10.8-29.1,20-47,29.4c-7.2,3.8-20.5,10-21.4,10C255.8,310.5,253.1,309.4,250.1,308L250.1,308z M260.7,262
|
||||
c16-8.5,31.4-18.5,43.7-28.4c20.3-16.2,32.5-32.3,35.1-46.1c0.6-3.2,0.4-12.3-0.4-17.4c-3.7-24.4-16.8-44.9-37.1-58.5
|
||||
c-10.5-7-22.5-11.4-35.7-13.2c-4.7-0.6-16.1-0.6-20.6,0c-10.5,1.5-18.3,3.8-27.4,8.4c-23.4,11.7-40.2,34-45,60
|
||||
c-1.3,6.9-1.7,16.5-0.9,20.9c4.1,22.1,33.4,49.8,78.1,73.9c3,1.6,5.4,2.9,5.5,2.9C256.1,264.4,258.2,263.3,260.7,262L260.7,262z"/>
|
||||
<path class="st1" d="M251.1,226.4c-8.5-1-17.1-4.4-24.1-9.7c-2.7-2-7.6-6.9-9.5-9.5c-4.6-6.2-7.9-13.7-9.3-21.2
|
||||
c-0.6-3.2-0.8-11.2-0.4-14.5c1.8-14.5,9.6-27.3,21.6-35.3c6.1-4,12.1-6.4,19.5-7.7c3.6-0.6,10.3-0.6,14.1,0
|
||||
c21.4,3.5,37.8,20.3,40.9,41.9c0.5,3.5,0.5,10.2,0,13.8c-2,14.1-9.8,26.5-21.7,34.5C273.3,224.6,261.5,227.6,251.1,226.4
|
||||
L251.1,226.4z"/>
|
||||
</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:#52aeff}</style><path d="M240 474c-15.6-24.9-17.8-28.1-22.1-33.1-2.8-3.3-12.1-12.5-16-16-16.1-14.2-32.5-26-64.5-46.5-12.8-8.2-27.2-18.9-38.6-28.7-8.6-7.3-21.6-19.9-28.7-27.8C24 270.9 0 210.9 0 146.5c0-36.8 7.7-72.6 22.8-106.2 4.9-10.7 14.2-27.9 15-27.5 3.7 2.2 60.8 37.1 60.8 37.3 0 .1-1.1 2.1-2.4 4.4C75.8 90 67.8 131.7 73.6 172.2c7.2 50.7 37.1 97.4 85.5 133.7 7 5.2 11.6 8.4 20.7 14.3 19.2 12.3 30.2 19.9 43.7 29.9 12 9 19.7 15.3 31.2 25.6l1.4 1.3 1-.9c23.7-21.4 40.8-33.8 76.9-57 40-25.7 69.5-56.9 87.2-92.3 15.4-30.7 21.6-64 18.3-98-2.6-26.5-10.5-51.6-23.6-74.5-1.3-2.2-2.3-4.1-2.3-4.2s2.3-1.6 5.1-3.2c5.9-3.6 54.7-33.4 55.5-33.9.5-.3.6-.2 2.6 3.2C500 55.9 512 100.4 512 146.6c0 61.5-22.3 119.7-64.5 168.8-8.9 10.3-21 22.6-31.4 31.7-14 12.3-27.2 22.1-46.2 34.3-41.7 26.8-66.6 47-80 64.8-1.1 1.5-9.1 14-17.9 27.9-8.7 13.8-15.9 25.2-16 25.2-.1-.1-7.3-11.4-16-25.3" style="fill:#0076ff"/><path d="M250.1 308c-18.3-8.3-38-19.6-54.2-30.9-22.6-15.8-39.3-31.9-50.4-48.4-10.9-16.3-16-33.1-15.3-50.2.8-19.5 4.9-35.8 13.3-52.6 4.3-8.5 8.6-15.3 14.3-22.5C178.3 77.7 207.9 61 240.3 57c9.1-1.1 21.4-1.2 30.2-.2 38.6 4.6 72.2 26.1 92.8 59.3 2.9 4.7 7.7 14.3 9.8 19.5 5.4 13.8 8.2 27.5 8.9 43.1 1.3 31.8-18 62.8-57.5 92.4-14.5 10.8-29.1 20-47 29.4-7.2 3.8-20.5 10-21.4 10-.3 0-3-1.1-6-2.5m10.6-46c16-8.5 31.4-18.5 43.7-28.4 20.3-16.2 32.5-32.3 35.1-46.1.6-3.2.4-12.3-.4-17.4-3.7-24.4-16.8-44.9-37.1-58.5-10.5-7-22.5-11.4-35.7-13.2-4.7-.6-16.1-.6-20.6 0-10.5 1.5-18.3 3.8-27.4 8.4-23.4 11.7-40.2 34-45 60-1.3 6.9-1.7 16.5-.9 20.9 4.1 22.1 33.4 49.8 78.1 73.9 3 1.6 5.4 2.9 5.5 2.9.1-.1 2.2-1.2 4.7-2.5" class="st1"/><path d="M251.1 226.4c-8.5-1-17.1-4.4-24.1-9.7-2.7-2-7.6-6.9-9.5-9.5-4.6-6.2-7.9-13.7-9.3-21.2-.6-3.2-.8-11.2-.4-14.5 1.8-14.5 9.6-27.3 21.6-35.3 6.1-4 12.1-6.4 19.5-7.7 3.6-.6 10.3-.6 14.1 0 21.4 3.5 37.8 20.3 40.9 41.9.5 3.5.5 10.2 0 13.8-2 14.1-9.8 26.5-21.7 34.5-8.9 5.9-20.7 8.9-31.1 7.7" class="st1"/></svg>
|
||||
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.0 KiB |
Reference in New Issue
Block a user