From 8d8ac89ddf38b435c7ecc223ba6ecd9a57869eda Mon Sep 17 00:00:00 2001
From: Fabian Stamm <hibas123@noreply.git.stamm.me>
Date: Tue, 16 Jun 2020 08:12:29 +0000
Subject: [PATCH] =?UTF-8?q?=E2=80=9Eviews/admin.html=E2=80=9C=20=C3=A4nder?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 views/admin.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/views/admin.html b/views/admin.html
index 5d3dd56..a51fb85 100644
--- a/views/admin.html
+++ b/views/admin.html
@@ -60,11 +60,7 @@
                style="margin: 1rem;"
             ></div>
          </div>
-<<<<<<< HEAD
          <div style="position: relative;">
-=======
-         <div style="position:relative;">
->>>>>>> 0bfdbce908484560108e20cede6f9e7c46710818
             <iframe id="content"></iframe>
          </div>
       </div>