diff options
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… |
