Commit b3c92cdd7735256cc526f37dcade82ab976c248d
1 parent
3a0e28ed
Exists in
master
and in
9 other branches
Just remove bad lines (unsolved merge conflicts and unnecessary meta data
Showing
2 changed files
with
0 additions
and
5 deletions
Show diff stats
style.css
| @@ -134,11 +134,7 @@ body { | @@ -134,11 +134,7 @@ body { | ||
| 134 | 134 | ||
| 135 | #content h1, #content h2, #content h3, #content h4, #content h5, #content h6{ | 135 | #content h1, #content h2, #content h3, #content h4, #content h5, #content h6{ |
| 136 | margin-top: 20px; | 136 | margin-top: 20px; |
| 137 | -<<<<<<< 22561cf84ef741968c2784eb32a3c64c4cc35acc | ||
| 138 | margin-bottom: 10px; | 137 | margin-bottom: 10px; |
| 139 | -======= | ||
| 140 | - margin-bottom:10px | ||
| 141 | ->>>>>>> adjust headers styles on general and specific cases | ||
| 142 | color: inherit; | 138 | color: inherit; |
| 143 | font-family: Arial; | 139 | font-family: Arial; |
| 144 | font-weight: 700; | 140 | font-weight: 700; |
theme.yml