update

2017-01-02 20:38:25 +00:00
parent 32c9fe029f
commit 55dd90716e
1 changed files with 0 additions and 4 deletions
--- a/_embed/public/css/styles.css
+++ b/_embed/public/css/styles.css
@@ -564,11 +564,7 @@ header .actions {

 #bottom-bar>*:first-child {
    margin-right: auto;
-<<<<<<< HEAD
    max-width: calc(100% - 25em);
-=======
-    max-width: calc(100% - 24em);
->>>>>>> cb77ca979b94519ce5afc5ea25e33cd44732e1d8
    width: 100%;
 }