„views/admin.html“ ändern

2020-06-16 08:12:29 +00:00 · 2020-06-16 08:12:29 +00:00 · 8d8ac89ddf
parent 8a2abcc543
commit 8d8ac89ddf
1 changed files with 0 additions and 4 deletions
--- 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>