chore: fix merge conflict #34

Merged
teutat3s merged 1 commit from refs/pull/34/head into main 2021-10-07 23:40:33 +00:00
teutat3s commented 2021-10-07 23:26:05 +00:00 (Migrated from git.b12f.io)
No description provided.
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: pub-solar/os#34
No description provided.