diff options
| author | Mark Otto <[email protected]> | 2011-06-28 14:30:48 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-06-28 14:30:48 -0700 |
| commit | 01c5e74bb3a351feb0c83ff14fb22244647eb82b (patch) | |
| tree | 1d72cf2f382060bc552151dbfe2df1b2647f0d73 /lib/preboot.less | |
| parent | 5949b8e14559464539541ee02f6af4fc2cfe1cbf (diff) | |
| parent | e91a74e8e89240d061478326ad26bd4ffa9ce910 (diff) | |
| download | bootstrap-01c5e74bb3a351feb0c83ff14fb22244647eb82b.tar.xz bootstrap-01c5e74bb3a351feb0c83ff14fb22244647eb82b.zip | |
resolve conflict
Diffstat (limited to 'lib/preboot.less')
| -rw-r--r-- | lib/preboot.less | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/preboot.less b/lib/preboot.less index b91df8a62..e8b0cb755 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -1,7 +1,7 @@ /* - Preboot - Variables and mixins to pre-ignite any new web development project -*/ + * Preboot.less + * Variables and mixins to pre-ignite any new web development project + */ /* Variables @@ -70,7 +70,7 @@ } // Center-align a block level element -.center-block { +.center-block { display: block; margin: 0 auto; } |