From fa188875334df96525e33599cb487ab9b2b1581e Mon Sep 17 00:00:00 2001
From: qbi <qbi@kubieziel.de>
Date: Sat, 24 Oct 2020 00:35:14 +0200
Subject: [PATCH] =?UTF-8?q?=C3=9Cberreste=20von=20einem=20Merge-Konflikt?=
 =?UTF-8?q?=20gel=C3=B6scht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Themen.org | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/Themen.org b/Themen.org
index e12cb61..29195ea 100644
--- a/Themen.org
+++ b/Themen.org
@@ -115,15 +115,3 @@
 
 
 ** Jabber/XMPP
-<<<<<<< HEAD
-** JMStV
-=======
-
-** HTTP
-   Was ist das Hypertext Transfer Protocol?
-
-** HTTP/2
-
-** git
-Wie funktioniert git?
->>>>>>> 968fc777fc750eaa4e4d6ca7a1fcc858cd2893e1