diff options
Diffstat (limited to 'presentation/css/style.css')
| -rw-r--r-- | presentation/css/style.css | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/presentation/css/style.css b/presentation/css/style.css index db9af40..cf0e33b 100644 --- a/presentation/css/style.css +++ b/presentation/css/style.css @@ -30,6 +30,7 @@ right: 35%; } +<<<<<<< HEAD .description { margin-top: 16px; } @@ -38,6 +39,8 @@ display: none; } +======= +>>>>>>> origin/master table, tbody, tr { border: 0; !important; @@ -47,4 +50,11 @@ 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 |