2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00

le merging conflicts

This commit is contained in:
Mark Otto
2011-08-29 21:26:53 -07:00
parent 654cc5ad3f
commit f17fc367f7
6 changed files with 221 additions and 59 deletions
+1 -1
View File
@@ -46,7 +46,7 @@
.offset6 { .offset(6); }
.offset7 { .offset(7); }
.offset8 { .offset(8); }
.offset9 { .offset(8); }
.offset9 { .offset(9); }
.offset10 { .offset(10); }
.offset11 { .offset(11); }
.offset12 { .offset(12); }