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/bootstrap.less | |
| parent | 5949b8e14559464539541ee02f6af4fc2cfe1cbf (diff) | |
| parent | e91a74e8e89240d061478326ad26bd4ffa9ce910 (diff) | |
| download | bootstrap-01c5e74bb3a351feb0c83ff14fb22244647eb82b.tar.xz bootstrap-01c5e74bb3a351feb0c83ff14fb22244647eb82b.zip | |
resolve conflict
Diffstat (limited to 'lib/bootstrap.less')
| -rw-r--r-- | lib/bootstrap.less | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bootstrap.less b/lib/bootstrap.less index ddf5582d5..6fceabd24 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -1,7 +1,7 @@ /* - Master Stylesheet - This file is only for importing all required stylesheets for LESS to include and then compile. -*/ + * Master Stylesheet + * This file is only for importing all required stylesheets for LESS to include and then compile. + */ // CSS Reset @import "reset.less"; |