diff options
| author | Mark Otto <[email protected]> | 2011-08-25 23:12:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-25 23:12:29 -0700 |
| commit | 8c2df3ac3ad2c4d87e0057bc76986e902cd2959b (patch) | |
| tree | 521f7f7f77a4bf067d6ad524a195ff2c104ffc3c /lib/patterns.less | |
| parent | dd4bb95c2db5db9bb6727147002d916cb86756e6 (diff) | |
| parent | 2d99e3f8a61ef9d4a40cd0cad109d0d89ae3c661 (diff) | |
| download | bootstrap-8c2df3ac3ad2c4d87e0057bc76986e902cd2959b.tar.xz bootstrap-8c2df3ac3ad2c4d87e0057bc76986e902cd2959b.zip | |
resolve conflicts in merging in other branch
Diffstat (limited to 'lib/patterns.less')
| -rw-r--r-- | lib/patterns.less | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/patterns.less b/lib/patterns.less index be5394df5..6fcbbb953 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -624,6 +624,7 @@ input[type=submit].btn { .border-radius(0 0 6px 6px); .box-shadow(inset 0 1px 0 #fff); .clearfix(); + margin-bottom: 0; .btn { float: right; margin-left: 10px; |