updated styling

tesis-lab · Jan 14, 2017 · ffb227c · ffb227c
1 parent 5314d0d
commit ffb227c
Showing 1 changed file with 0 additions and 24 deletions.
diff --git a/client/styles/style.css b/client/styles/style.css
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-/*<!-- Created by Duncan on 12.28.2016 -->*/
->>>>>>> 724d88a4db4f68b65bf4c6f5fb1500c7b15dd56b
 *, *::before, *::after {
  -webkit-box-sizing: border-box;
  -moz-box-sizing: border-box;
@@ -13,24 +9,4 @@ html, body{
 }
 body{
  padding-top: 13vh;
-<<<<<<< HEAD
-=======
-}
-.float-l {
- float: left;
-}
-.float-r {
- float: right;
-}
-
-.float-l {
- float: left;
-}
-
-.float-r {
- float: right;
-}
-.pad-top-8 {
- padding-top: 8em;
->>>>>>> 724d88a4db4f68b65bf4c6f5fb1500c7b15dd56b
 }