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" width="256" height="256" preserveAspectRatio="xMidYMid" version="1.1" viewBox="0 0 256 256"><g><path fill="#73CC58" d="M256,127.948408 L128.051592,0 L0,127.948408 L128.051592,256 L256,127.948408 Z M128.051592,34.0232702 L175.15174,81.1922074 C159.722263,77.0442026 143.852533,74.9117291 127.989682,74.9117291 C112.058041,74.8979712 96.1951901,77.0098079 80.8276233,81.1922074 L128.051592,34.0232702 Z M86.1037754,179.856939 C98.9456908,172.765441 113.381787,169.06054 128.051592,169.091197 C142.965148,169.091197 157.287115,172.840414 169.999409,179.856939 L128.051592,221.804756 L86.1037754,179.856939 Z M187.49257,162.363778 C169.380304,150.827784 148.695311,145.028832 127.989682,145.028832 C106.906413,145.017692 86.2590877,151.032171 68.479914,162.363778 L35.46097,129.344834 C62.165041,109.726078 94.3103587,99.0774688 128.099745,99.0774688 C161.889131,99.0774688 194.000054,109.657289 220.738519,129.344834 L187.49257,162.363778 Z"/></g></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" preserveAspectRatio="xMidYMid"><path fill="#73CC58" d="M256 127.948 128.052 0 0 127.948 128.052 256zM128.052 34.023l47.1 47.17c-15.43-4.149-31.3-6.281-47.162-6.281a179 179 0 0 0-47.162 6.28zM86.104 179.857a86.4 86.4 0 0 1 41.948-10.766c14.913 0 29.235 3.75 41.947 10.766l-41.947 41.948zm101.389-17.493a110.7 110.7 0 0 0-59.503-17.335 110.6 110.6 0 0 0-59.51 17.335l-33.019-33.02c26.704-19.618 58.85-30.267 92.639-30.267 33.79 0 65.9 10.58 92.639 30.268z"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 527 B |
Reference in New Issue
Block a user