fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 2298 512" style="enable-background:new 0 0 2298 512" xml:space="preserve"><style type="text/css">.st0{fill:#00b2ff}</style><g><path d="M1277.9,288.3l-60.4,71.8l113.6,135c16.2,19.8,45.3,22.6,65.1,6.5c19.8-16.2,22.6-45.3,6.5-65.1 c-0.2-0.3-0.5-0.6-0.7-0.8L1277.9,288.3z M1401.9,76.4c16.5-19.6,14-48.8-5.6-65.3c-19.6-16.5-48.8-14-65.3,5.6l-113.6,135 l60.4,71.9L1401.9,76.4z M1083.2,57.3l-0.5-0.6l-32.9-39.9c-16.7-19.4-45.9-21.6-65.2-4.9c-19,16.4-21.5,45-5.6,64.4L1130,256 L979,435.6c-16.5,19.6-14,48.8,5.5,65.3c19.6,16.5,48.8,14,65.3-5.5l32.9-39.2l0.5-0.6L1250.7,256L1083.2,57.3z" class="st0"/></g><path d="M346.7,418.8H133.2l119.5-162.3L381.7,80.7c15.2-20.5,11-49.4-9.5-64.6c-0.1-0.1-0.3-0.2-0.4-0.3 c-7.4-5.3-16.2-8.3-25.3-8.5H44c-23.8,1-42.3,21.2-41.3,45c1,22.4,18.9,40.3,41.3,41.3h213.9L138.4,255.8L9.1,431.5 C-6.1,452-1.8,480.8,18.6,496c7.4,5.5,16.4,8.7,25.7,9h302.4c23.8-1,42.3-21.2,41.3-45C387,437.7,369,419.8,346.7,418.8 M2256.9,418.8h-189.6V47c0-25.5-20.8-46.2-46.3-46.2c-25.5,0-46.2,20.7-46.2,46.2v415c0,23.8,19.3,43.1,43.1,43.1h238.9 c23.8-1,42.3-21.2,41.3-45c-1-22.4-18.9-40.3-41.3-41.3 M1822.1,418.8h-192.5V293.5h128c23.8-1,42.3-21.2,41.3-45 c-1-22.4-18.9-40.3-41.3-41.3h-128V93.7h192.5c23.8,1,44-17.4,45-41.3c1-23.8-17.4-44-41.3-45c-1.2-0.1-2.5-0.1-3.7,0h-241.7 c-23.8,0-43.1,19.3-43.2,43.1v411.4c0,23.8,19.3,43.2,43.2,43.2l0,0h241.8c23.8,1,44-17.4,45-41.3c1-23.8-17.4-44-41.3-45 C1824.7,418.7,1823.5,418.7,1822.1,418.8 M872.3,8.6C851.1-5.7,822.3,0,808.1,21.2l-84.7,125.8l-46.2,68.8l-46-68.8l-84.9-126 c-14-21.4-42.7-27.3-64-13.3c-21.4,14-27.3,42.7-13.3,64c0.2,0.3,0.4,0.6,0.6,0.9l161.7,240.2v152.8c0,25.5,20.7,46.2,46.2,46.2 s46.2-20.7,46.2-46.2V312.7L885.1,72.5C899.1,51.3,893.4,22.8,872.3,8.6"/></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 2298 512"><path d="m1277.9 288.3-60.4 71.8 113.6 135c16.2 19.8 45.3 22.6 65.1 6.5 19.8-16.2 22.6-45.3 6.5-65.1-.2-.3-.5-.6-.7-.8zm124-211.9c16.5-19.6 14-48.8-5.6-65.3s-48.8-14-65.3 5.6l-113.6 135 60.4 71.9zm-318.7-19.1-.5-.6-32.9-39.9c-16.7-19.4-45.9-21.6-65.2-4.9-19 16.4-21.5 45-5.6 64.4L1130 256 979 435.6c-16.5 19.6-14 48.8 5.5 65.3 19.6 16.5 48.8 14 65.3-5.5l32.9-39.2.5-.6L1250.7 256z" style="fill:#00b2ff"/><path d="M346.7 418.8H133.2l119.5-162.3 129-175.8c15.2-20.5 11-49.4-9.5-64.6-.1-.1-.3-.2-.4-.3-7.4-5.3-16.2-8.3-25.3-8.5H44c-23.8 1-42.3 21.2-41.3 45 1 22.4 18.9 40.3 41.3 41.3h213.9L138.4 255.8 9.1 431.5C-6.1 452-1.8 480.8 18.6 496c7.4 5.5 16.4 8.7 25.7 9h302.4c23.8-1 42.3-21.2 41.3-45-1-22.3-19-40.2-41.3-41.2m1910.2 0h-189.6V47c0-25.5-20.8-46.2-46.3-46.2s-46.2 20.7-46.2 46.2v415c0 23.8 19.3 43.1 43.1 43.1h238.9c23.8-1 42.3-21.2 41.3-45-1-22.4-18.9-40.3-41.3-41.3m-434.7 0h-192.5V293.5h128c23.8-1 42.3-21.2 41.3-45-1-22.4-18.9-40.3-41.3-41.3h-128V93.7h192.5c23.8 1 44-17.4 45-41.3 1-23.8-17.4-44-41.3-45-1.2-.1-2.5-.1-3.7 0h-241.7c-23.8 0-43.1 19.3-43.2 43.1v411.4c0 23.8 19.3 43.2 43.2 43.2h241.8c23.8 1 44-17.4 45-41.3 1-23.8-17.4-44-41.3-45-1.2-.1-2.4-.1-3.8 0M872.3 8.6c-21.2-14.3-50-8.6-64.2 12.6L723.4 147l-46.2 68.8-46-68.8-84.9-126c-14-21.4-42.7-27.3-64-13.3-21.4 14-27.3 42.7-13.3 64l.6.9 161.7 240.2v152.8c0 25.5 20.7 46.2 46.2 46.2s46.2-20.7 46.2-46.2V312.7L885.1 72.5c14-21.2 8.3-49.7-12.8-63.9"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.5 KiB |
Reference in New Issue
Block a user