remove git merge conflict marker #17

Merged
defaultxr merged 1 commit from patch-1 into endless 2023-02-20 10:12:20 +00:00
defaultxr commented 2023-02-20 04:25:54 +00:00 (Migrated from github.com)
No description provided.
zzkt commented 2023-02-20 10:10:14 +00:00 (Migrated from github.com)

oops. thanks!

oops. thanks!
Sign in to join this conversation.
No reviewers
No labels
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: zzkt/osc#17
No description provided.