diff options
| author | hanemile <mail@emile.space> | 2020-07-19 16:46:51 +0200 |
|---|---|---|
| committer | hanemile <mail@emile.space> | 2020-07-19 16:46:51 +0200 |
| commit | 5f4a132f1656d8aa388e1ca3151c1bcc222c0cb6 (patch) | |
| tree | b7e722dbdfdc8bb0e8caa74563086163fd133401 /README.md | |
| parent | 508097bd45862195ab45e2179806af78084b83b1 (diff) | |
| parent | 766683ed07acf3339b750b24f85136c6aab8c717 (diff) | |
foo
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/README.md b/README.md index 338e4ca..daecce9 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,11 @@ Super basic piece of Software for handling talk submissions. +<<<<<<< HEAD +======= + + +>>>>>>> refs/remotes/origin/master ## Usage Well, It's pretty straitfowards… |
