chore: fix merge conflict (#34)
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/34 Co-authored-by: teutat3s <teutates@mailbox.org> Co-committed-by: teutat3s <teutates@mailbox.org>
This commit is contained in:
parent
916a812af1
commit
e41f1a1317
Loading…
Reference in a new issue