fixing conflicts
This commit is contained in:
parent
f56961b245
commit
9ccf707476
@ -90,8 +90,5 @@
|
|||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
<<<<<<< HEAD
|
|
||||||
</svg>
|
</svg>
|
||||||
=======
|
|
||||||
</svg>
|
|
||||||
>>>>>>> upload page ui
|
|
||||||
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Loading…
Reference in New Issue
Block a user