fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
+1
-21
@@ -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:#E58325;}
|
||||
</style>
|
||||
<g>
|
||||
<path class="st0" d="M363.2,37.4c-50.2,51.3-72.5,74.5-85.1,88.6c-2.4,2.7-4.7,5.1-4.9,5.3c-0.2,0.2-2.4,2.7-4.7,5.4
|
||||
c-9.6,11.4-11.9,29.6-5.8,45.5c2,5.2,8.9,17.7,10.4,18.9c0.3,0.2,1.9,1.9,3.6,3.6l3,3.2L152.3,335.2L25.1,462.4L43.6,481L62,499.8
|
||||
l91-91l90.9-90.9l90.4,90.4c49.7,49.7,90.8,90.5,91.1,90.6c0.8,0.2,35.9-34.8,36.4-36.2c0.2-0.4-40.5-41.5-90.3-91.3L281,280.7
|
||||
l14-13.9c19-18.8,19.9-19.6,22.4-19.6c0.8,0,3.1,1.4,5,3.3c10.5,9.9,25.1,15.1,40.8,14.4c12.1-0.5,20.7-4.8,36-17.9
|
||||
c10-8.6,15.1-13.6,64.1-62.3l48.7-48.5l-12.2-12.4c-6.7-6.8-12.3-12.3-12.4-12.1c-0.2,0.1-19.4,19.3-42.8,42.5l-42.5,42.4l-12.1-12
|
||||
c-6.7-6.6-12.2-12.3-12.2-12.5c0-0.3,19-19.6,42.4-43l42.3-42.5l-12.1-12.2c-6.6-6.7-12.2-12.2-12.4-12.2
|
||||
c-0.2,0-19.6,19.1-42.9,42.4l-42.5,42.5l-12.4-12.3l-12.4-12.3l42.5-42.5c23.4-23.4,42.5-42.7,42.5-42.9c0-0.4-14.7-15.3-22.1-22.5
|
||||
l-2.6-2.4L363.2,37.4z"/>
|
||||
<path class="st0" d="M25.1,37.3C17,46,10.7,56.8,5.9,70.7c-1.5,4.3-2.7,7.9-2.6,7.9s-0.2,1.7-0.7,3.8c-3.2,13.7-3.5,30.3-0.8,43.1
|
||||
c5.5,26,13.5,37.4,59.2,83.6c15.1,15.3,77.2,77.3,79.9,80c0.5,0.4,73.9-72.9,73.9-73.8c0-0.7-129.2-129.9-161.5-161.5
|
||||
c-11.8-11.5-22.1-21-22.7-21C29.9,32.7,27.5,34.8,25.1,37.3z"/>
|
||||
</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:#e58325}</style><path d="M363.2 37.4c-50.2 51.3-72.5 74.5-85.1 88.6-2.4 2.7-4.7 5.1-4.9 5.3s-2.4 2.7-4.7 5.4c-9.6 11.4-11.9 29.6-5.8 45.5 2 5.2 8.9 17.7 10.4 18.9.3.2 1.9 1.9 3.6 3.6l3 3.2-127.4 127.3L25.1 462.4 43.6 481 62 499.8l91-91 90.9-90.9 90.4 90.4c49.7 49.7 90.8 90.5 91.1 90.6.8.2 35.9-34.8 36.4-36.2.2-.4-40.5-41.5-90.3-91.3L281 280.7l14-13.9c19-18.8 19.9-19.6 22.4-19.6.8 0 3.1 1.4 5 3.3 10.5 9.9 25.1 15.1 40.8 14.4 12.1-.5 20.7-4.8 36-17.9 10-8.6 15.1-13.6 64.1-62.3l48.7-48.5-12.2-12.4c-6.7-6.8-12.3-12.3-12.4-12.1-.2.1-19.4 19.3-42.8 42.5l-42.5 42.4-12.1-12c-6.7-6.6-12.2-12.3-12.2-12.5 0-.3 19-19.6 42.4-43l42.3-42.5-12.1-12.2c-6.6-6.7-12.2-12.2-12.4-12.2s-19.6 19.1-42.9 42.4l-42.5 42.5-12.4-12.3-12.4-12.3L370.3 80c23.4-23.4 42.5-42.7 42.5-42.9 0-.4-14.7-15.3-22.1-22.5l-2.6-2.4z" class="st0"/><path d="M25.1 37.3C17 46 10.7 56.8 5.9 70.7c-1.5 4.3-2.7 7.9-2.6 7.9s-.2 1.7-.7 3.8c-3.2 13.7-3.5 30.3-.8 43.1 5.5 26 13.5 37.4 59.2 83.6 15.1 15.3 77.2 77.3 79.9 80 .5.4 73.9-72.9 73.9-73.8 0-.7-129.2-129.9-161.5-161.5-11.8-11.5-22.1-21-22.7-21-.7-.1-3.1 2-5.5 4.5" class="st0"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.2 KiB |
Reference in New Issue
Block a user