resolve conflicts in merging in other branch

2026-05-27 14:46:01 +03:00 · 2011-08-25 23:12:29 -07:00
parent dd4bb95c2d 2d99e3f8a6
commit 8c2df3ac3a
7 changed files with 701 additions and 268 deletions
@@ -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;