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 32 32" style="enable-background:new 0 0 32 32" xml:space="preserve"><style type="text/css">.st0{fill:#0082c9}.st1{fill:#fff}</style><g><path d="M5,0h22c2.8,0,5,2.2,5,5v22c0,2.8-2.2,5-5,5H5c-2.8,0-5-2.2-5-5V5C0,2.2,2.2,0,5,0z" class="st0"/><path d="M4.1,5.3C3.7,5.3,3.5,5.7,3.5,6V26c0,0.4,0.4,0.8,0.8,0.8h23.5c0.4,0,0.8-0.4,0.8-0.8V6.4 c0-0.6-0.5-1.1-0.9-1.1L4.1,5.3z M5.3,7.1l21.5,0V16l-1.8-1.8l-5.4,7.2L14.2,16l-7.2,7.2H5.3V7.1z M9.7,8.8c-1.5,0-2.7,1.2-2.7,2.7 s1.2,2.7,2.7,2.7s2.7-1.2,2.7-2.7S11.2,8.8,9.7,8.8z" class="st1"/></g></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 32 32"><path d="M5 0h22c2.8 0 5 2.2 5 5v22c0 2.8-2.2 5-5 5H5c-2.8 0-5-2.2-5-5V5c0-2.8 2.2-5 5-5" style="fill:#0082c9"/><path d="M4.1 5.3c-.4 0-.6.4-.6.7v20c0 .4.4.8.8.8h23.5c.4 0 .8-.4.8-.8V6.4c0-.6-.5-1.1-.9-1.1zm1.2 1.8h21.5V16L25 14.2l-5.4 7.2-5.4-5.4L7 23.2H5.3zm4.4 1.7C8.2 8.8 7 10 7 11.5s1.2 2.7 2.7 2.7 2.7-1.2 2.7-2.7-1.2-2.7-2.7-2.7" style="fill:#fff"/></svg>
|
||||
|
Before Width: | Height: | Size: 672 B After Width: | Height: | Size: 443 B |
Reference in New Issue
Block a user