diff options
| author | Marvin Borner | 2019-06-23 12:43:01 +0200 |
|---|---|---|
| committer | Marvin Borner | 2019-06-23 12:43:01 +0200 |
| commit | 58c37bec9826396aa0da9f983007522c9a62107d (patch) | |
| tree | 581268ae11115adb290bf054b24ac43e143bc7ed /presentation/css | |
| parent | 0740711fdeadb4765a2e1f495ed85b4846ef926f (diff) | |
| parent | 0f82454032665192eaafec9dd76e88e7efa35b9f (diff) | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# presentation/css/style.css
Diffstat (limited to 'presentation/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 |