Fixing after react update

2023-05-05 23:10:06 +03:00
parent 21fa38cc4d
commit d069e56397
45 changed files with 550 additions and 31 deletions
@@ -333,7 +333,11 @@ button {
 /* Landing Page */
 .landing {
  position: relative;
+<<<<<<< HEAD
+  background: url('./img/showcase.jpg') no-repeat center center/cover;
+=======
  background: url('./img/vimCheatSheet.jpg') no-repeat center center/cover;
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
  height: 100vh;
 }

@@ -581,4 +585,8 @@ button {
  top: 4rem;
  right: 2rem;
  display: inline-block;
-}
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb