fix conflicts

This commit is contained in:
Murod Khaydarov 2018-06-23 22:40:31 +03:00
commit cac6bacdfc
No known key found for this signature in database
GPG key ID: C480BA53A8D274C5
3 changed files with 6619 additions and 16 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,16 +0,0 @@
<svg width="18px" height="4px" viewBox="0 0 18 4" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Settings" transform="translate(-1288.000000, -1593.000000)" fill="#7B7E89">
<g id="Block---HEADER" transform="translate(53.000000, 1572.000000)">
<g id="Settings-Icon" transform="translate(1235.000000, 21.000000)">
<circle id="Oval-3" cx="9" cy="2" r="2"></circle>
<circle id="Oval-3" cx="2" cy="2" r="2"></circle>
<circle id="Oval-3" cx="16" cy="2" r="2"></circle>
</g>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 825 B