about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--README.md3
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
-=======
 ![](./imgs/frontpage.png)
 
->>>>>>> refs/remotes/origin/master
 ## Usage
 
 Well, It's pretty straitfowards…