diff options
| author | Mark Otto <[email protected]> | 2011-08-29 21:26:53 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-29 21:26:53 -0700 |
| commit | f17fc367f724ef68e287c45c129558fb62fc6b8e (patch) | |
| tree | 063445d837b8e3253e2f5aa8dcbf4d6e5f29d47c /lib/scaffolding.less | |
| parent | 654cc5ad3fbbc618375a39f42ce9603c7f6897c4 (diff) | |
| download | bootstrap-f17fc367f724ef68e287c45c129558fb62fc6b8e.tar.xz bootstrap-f17fc367f724ef68e287c45c129558fb62fc6b8e.zip | |
le merging conflicts
Diffstat (limited to 'lib/scaffolding.less')
| -rw-r--r-- | lib/scaffolding.less | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 0833e0c83..2bbb1dc6c 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -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); } |