From c128842e20c27c4d849e9c264f240dd502d9c455 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sun, 23 Jun 2019 12:45:02 +0200
Subject: Fixed minor issues

---
 presentation/css/style.css | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'presentation/css')

diff --git a/presentation/css/style.css b/presentation/css/style.css
index cf0e33b..db9af40 100644
--- a/presentation/css/style.css
+++ b/presentation/css/style.css
@@ -30,7 +30,6 @@
     right: 35%;
 }
 
-<<<<<<< HEAD
 .description {
     margin-top: 16px;
 }
@@ -39,8 +38,6 @@
     display: none;
 }
 
-=======
->>>>>>> origin/master
 table, tbody, tr {
     border: 0;
 !important;
@@ -50,11 +47,4 @@ td, th {
     text-align: center !important;
     border: 1px solid white !important;
     border-collapse: collapse;
-<<<<<<< HEAD
-=======
-}
-
-.description {
-    margin-top: 16px;
->>>>>>> origin/master
 }
\ No newline at end of file
-- 
cgit v1.2.3