From ba9b3dfae3166406fa759b1c52909c12b47d09fc Mon Sep 17 00:00:00 2001
From: hanemile <mail@emile.space>
Date: Sun, 19 Jul 2020 16:47:16 +0200
Subject: removed merge foo

---
 README.md | 3 ---
 1 file changed, 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…
-- 
cgit 1.4.1