fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
+1
-12
@@ -1,12 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" x="0px" y="0px" style="enable-background:new 0 0 512 512;" xml:space="preserve" viewBox="30.39 0 451.21 512.03">
|
||||
<style type="text/css">
|
||||
.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#26F4EE;}
|
||||
.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#FB2C53;}
|
||||
.st2{fill-rule:evenodd;clip-rule:evenodd;}
|
||||
</style>
|
||||
<g>
|
||||
<path class="st0" d="M345.2,0c8.2,70.4,50.4,120.1,118.7,124.5v66.8l-0.4,0v-56.7C395.2,130.2,356,88.2,347.7,17.8l-72.3,0V314 c10.4,133.3-93.4,137.3-133.2,86.7c46.6,29.1,122.3,10.2,113.3-104.5V0H345.2L345.2,0z M151,491c-40.8-8.4-78-32.8-99.8-68.5 c-53-86.7-5.2-228,148.5-242.5v83.5l-0.3,0v-62.6C56.9,223.6,42.6,376.6,82.1,440.3C97.3,464.8,122.3,482.1,151,491L151,491z" fill="#ffffff"/>
|
||||
<path class="st1" d="M365.9,17.8c5.4,46,24,85.1,55.2,107.9c-42.3-16.3-67-53.7-73.4-107.9L365.9,17.8z M463.4,144.5 c5.8,1.2,11.9,2.1,18.2,2.5v79.2C442,230,407.4,217,367,192.7l6.2,135.6c0,43.7,0.2,63.7-23.3,103.9 c-52.6,90.2-147.3,97.3-211.4,54.4c83.8,34.6,210.6-7.4,210.3-158.3v-148c40.4,24.3,75,37.3,114.6,33.4V144.5z M199.4,201.7 c8.3-1.7,17-3,26.1-3.9v83.5c-33.3,5.5-54.4,15.7-64.3,34.6c-31.1,59.5,9,106.7,53.8,113.8c-52.1,8.7-113.2-44.2-76.8-113.8 c9.9-18.9,27.9-29.1,61.2-34.6V201.7z M298.4,17.8h2.8H298.4z" fill="#ffffff"/>
|
||||
<path class="st2" d="M347.7,17.8c8.2,70.4,47.5,112.4,115.7,116.8v79.1c-39.6,3.9-74.2-9.1-114.6-33.4v148 c0.3,193.1-207.4,207.8-266.8,112c-39.5-63.7-25.2-216.7,117.3-239.4v80.4c-33.3,5.5-51.3,15.7-61.2,34.6 c-61.1,116.8,152,186.3,137.2-1.9V17.8L347.7,17.8L347.7,17.8z" fill="#ffffff"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" viewBox="30.39 0 451.21 512.03"><path d="M345.2 0c8.2 70.4 50.4 120.1 118.7 124.5v66.8h-.4v-56.7C395.2 130.2 356 88.2 347.7 17.8h-72.3V314c10.4 133.3-93.4 137.3-133.2 86.7 46.6 29.1 122.3 10.2 113.3-104.5V0zM151 491c-40.8-8.4-78-32.8-99.8-68.5-53-86.7-5.2-228 148.5-242.5v83.5h-.3v-62.6C56.9 223.6 42.6 376.6 82.1 440.3c15.2 24.5 40.2 41.8 68.9 50.7" style="fill-rule:evenodd;clip-rule:evenodd;fill:#26f4ee"/><path d="M365.9 17.8c5.4 46 24 85.1 55.2 107.9-42.3-16.3-67-53.7-73.4-107.9zm97.5 126.7c5.8 1.2 11.9 2.1 18.2 2.5v79.2C442 230 407.4 217 367 192.7l6.2 135.6c0 43.7.2 63.7-23.3 103.9-52.6 90.2-147.3 97.3-211.4 54.4 83.8 34.6 210.6-7.4 210.3-158.3v-148c40.4 24.3 75 37.3 114.6 33.4zm-264 57.2q12.45-2.55 26.1-3.9v83.5c-33.3 5.5-54.4 15.7-64.3 34.6-31.1 59.5 9 106.7 53.8 113.8-52.1 8.7-113.2-44.2-76.8-113.8 9.9-18.9 27.9-29.1 61.2-34.6zm99-183.9h2.8z" style="fill-rule:evenodd;clip-rule:evenodd;fill:#fb2c53"/><path fill="#fff" d="M347.7 17.8c8.2 70.4 47.5 112.4 115.7 116.8v79.1c-39.6 3.9-74.2-9.1-114.6-33.4v148c.3 193.1-207.4 207.8-266.8 112-39.5-63.7-25.2-216.7 117.3-239.4v80.4c-33.3 5.5-51.3 15.7-61.2 34.6-61.1 116.8 152 186.3 137.2-1.9V17.8z" style="fill-rule:evenodd;clip-rule:evenodd"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.3 KiB |
Reference in New Issue
Block a user