diff options
Diffstat (limited to 'presentation/css/style.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 |