stylesheet rebase

resoai · Jan 19, 2022 · 0bee1a1 · 0bee1a1
1 parent 78a60a3
commit 0bee1a1
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/styles/main.less b/styles/main.less
@@ -343,12 +343,8 @@ body {
    }
 }
 
-<<<<<<< HEAD
-.header {
-=======
 .header,
 .footer {
->>>>>>> 87d104f (Add footer, matching functionality of header)
    position: absolute;
    z-index: 2;
    left: 0;