Kaiser 87b3e1eaa8 Resolved Shitty Conflict Resolution ... @obsidianical learn how to properly merge conflicting commits, you disgrace of a git user		2021-12-16 11:51:01 +01:00
..
actual-testing	started work	2021-12-16 11:45:16 +01:00
animals-example	Resolved Shitty Conflict Resolution	2021-12-16 11:51:01 +01:00
hello.sm	started work	2021-12-16 11:45:16 +01:00