update: merge conflict resolved + fixes

2021-01-21 23:54:20 +01:00
parent ef2b2295e4 32b055c2db
commit bc64019b63
28 changed files with 274 additions and 239 deletions
--- a/src/styles/about/_index.scss
+++ b/src/styles/about/_index.scss
@ -1,9 +1,5 @@
 #about {

-  p {
-    line-height: 22px;
-  }
-
  >div>div>div {
    min-height: 285px;
  }