diff options
| author | hanemile <mail@emile.space> | 2020-07-19 16:47:16 +0200 |
|---|---|---|
| committer | hanemile <mail@emile.space> | 2020-07-19 16:47:16 +0200 |
| commit | ba9b3dfae3166406fa759b1c52909c12b47d09fc (patch) | |
| tree | b992c85068d4f45d27c681c777905d5bffe2e4e3 | |
| parent | 5f4a132f1656d8aa388e1ca3151c1bcc222c0cb6 (diff) | |
removed merge foo
| -rw-r--r-- | README.md | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/README.md b/README.md index daecce9..2a757bc 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,8 @@ Super basic piece of Software for handling talk submissions. -<<<<<<< HEAD -=======  ->>>>>>> refs/remotes/origin/master ## Usage Well, It's pretty straitfowards… |
