fixing conflict.

3686b455 · Jacob Schatz · 265750c8 · 62aac539 · 3686b455
Commit 3686b455 authored Dec 23, 2015 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/assets/stylesheets/framework/common.scss app/assets/stylesheets/framework/common.scss +1 -1

No files found.
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -376,7 +376,7 @@ table {

 .center-top-menu, .left-top-menu {
  @include nav-menu;
-  text-align: center;
+  text-align: left;
  margin-top: 5px;
  margin-bottom: $gl-padding;
  height: auto;