Resolved Shitty Conflict Resolution #5

Merged
schrottkatze merged 0 commits from github/fork/Ihre-Kaiserliche-Hoheit/main into main 2021-12-16 10:53:05 +00:00
schrottkatze commented 2021-12-16 10:51:42 +00:00 (Migrated from gitlab.com)

Created by: Ihre-Kaiserliche-Hoheit

@obsidianical learn how to properly merge conflicting commits, you disgrace of a git user

*Created by: Ihre-Kaiserliche-Hoheit* @obsidianical learn how to properly merge conflicting commits, you disgrace of a git user
schrottkatze commented 2021-12-16 10:53:05 +00:00 (Migrated from gitlab.com)

Merged by: obsidianical at 2021-12-16 10:53:05 UTC

*Merged by: obsidianical at 2021-12-16 10:53:05 UTC*
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: schrottkatze/strath#5
No description provided.