mirror of
https://gitlab.com/timvisee/send.git
synced 2025-12-09 03:43:23 +00:00
fixing conflicts
This commit is contained in:
@@ -90,8 +90,5 @@
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<<<<<<< HEAD
|
||||
|
||||
</svg>
|
||||
=======
|
||||
</svg>
|
||||
>>>>>>> upload page ui
|
||||
|
||||
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Reference in New Issue
Block a user