From 07bdace9c562d0a691785f5d0f37880553b9c24e Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Mon, 2 Jan 2017 20:38:25 +0000
Subject: [PATCH] update
Former-commit-id: 55dd90716e60ed63e3f4ec85626d585346de715e
---
_embed/public/css/styles.css | 4 ----
1 file changed, 4 deletions(-)
diff --git a/_embed/public/css/styles.css b/_embed/public/css/styles.css
index c95d20a4..5cf7a8dc 100644
--- 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%;
}