update current version

2017-08-25 10:11:25 +02:00
parent c19344e1dc
commit 6e258f9bdb
6 changed files with 10 additions and 12 deletions
@@ -43,7 +43,6 @@ body {
  border-color: #00CC66;
 }

-<<<<<<< HEAD
 .mt-5 {
  margin-top: 5px;
 }
@@ -53,8 +52,3 @@ body {
 .mt-50 {
  margin-top: 50px;
 }
-=======
-.m-t-5 {
-    margin-top: 5px;
-}
->>>>>>> feat_9