diff options
| author | Marvin Borner | 2019-06-23 12:45:02 +0200 |
|---|---|---|
| committer | Marvin Borner | 2019-06-23 12:45:02 +0200 |
| commit | c128842e20c27c4d849e9c264f240dd502d9c455 (patch) | |
| tree | b320803d4dec601c359bcabf82e0c8bfae8c8d7e /presentation/css | |
| parent | 58c37bec9826396aa0da9f983007522c9a62107d (diff) | |
Fixed minor issues
Diffstat (limited to 'presentation/css')
| -rw-r--r-- | presentation/css/style.css | 10 |
1 files changed, 0 insertions, 10 deletions
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 |