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" x="0" y="0" version="1.1" viewBox="138.1 1.4 108.8 107.4" style="enable-background:new 138.1 1.4 108.8 107.4" xml:space="preserve"><path style="fill:#cfcfcf" d="M191.8,108.8c-29.6,0-53.7-24.1-53.7-53.7s24.1-53.7,53.7-53.7s53.7,24.1,53.7,53.7 C245.5,84.7,221.4,108.8,191.8,108.8z M191.8,13.1c-23.2,0-42,18.9-42,41.9s18.9,42,42,42c23.2,0,41.9-18.9,41.9-42 S215,13.1,191.8,13.1z"/><path style="fill:#51b289" d="M189.9,51.2L189.9,51.2c-2.5,1.3-5.6,0.2-6.9-2.3l-9.8-19.6c-1.3-2.5-0.2-5.6,2.3-6.9l0,0 c2.5-1.3,5.6-0.2,6.9,2.3l9.8,19.6C193.4,46.9,192.4,50,189.9,51.2z"/></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="138.1 1.4 108.8 107.4"><path d="M191.8 108.8c-29.6 0-53.7-24.1-53.7-53.7s24.1-53.7 53.7-53.7 53.7 24.1 53.7 53.7-24.1 53.7-53.7 53.7m0-95.7c-23.2 0-42 18.9-42 41.9s18.9 42 42 42c23.2 0 41.9-18.9 41.9-42S215 13.1 191.8 13.1" style="fill:#cfcfcf"/><path d="M189.9 51.2c-2.5 1.3-5.6.2-6.9-2.3l-9.8-19.6c-1.3-2.5-.2-5.6 2.3-6.9s5.6-.2 6.9 2.3l9.8 19.6c1.2 2.6.2 5.7-2.3 6.9" style="fill:#51b289"/></svg>
|
||||
|
Before Width: | Height: | Size: 652 B After Width: | Height: | Size: 469 B |
Reference in New Issue
Block a user