2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

resolve conflict

This commit is contained in:
Mark Otto
2011-09-02 22:09:49 -07:00
16 changed files with 1142 additions and 115 deletions
+2
View File
@@ -152,6 +152,8 @@
.transition(@transition) {
-webkit-transition: @transition;
-moz-transition: @transition;
-ms-transition: @transition;
-o-transition: @transition;
transition: @transition;
}