diff options
| author | Mark Otto <otto@github.com> | 2013-08-05 23:20:52 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2013-08-05 23:20:52 +0400 |
| commit | 96136dbb56e136278cc7084caf84291949925d0c (patch) | |
| tree | 6db39936e8b632420f5a322f70035ab4a991b470 /less/navbar.less | |
| parent | e23906facaa63fcc97bddbd0895c301699c9e942 (diff) | |
| parent | efac0bf8d6cda1e6af85fb84d30d673c8e0a2ee8 (diff) | |
Merge branch 'pullright' of https://github.com/liuyl/bootstrap into liuyl-pullright
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less/navbar.less')
| -rw-r--r-- | less/navbar.less | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/less/navbar.less b/less/navbar.less index 99d741790a..374327f122 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -318,7 +318,6 @@ } &.pull-right { - float: right; width: auto; } } |