diff options
| author | Chris Rebert <[email protected]> | 2014-10-22 08:45:02 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-10-22 08:45:02 -0700 |
| commit | 3a7d2691bea2c89f673941ad1cc7db71f0b795ec (patch) | |
| tree | c07f0cd9e8b386297fc04d04903df29c4a0a22dd | |
| parent | fece552ce05882d697d4fa335f7d06170e78415b (diff) | |
| parent | aa8269cfb6a251db60c3a86eb761650ecd81aefc (diff) | |
| download | bootstrap-3a7d2691bea2c89f673941ad1cc7db71f0b795ec.tar.xz bootstrap-3a7d2691bea2c89f673941ad1cc7db71f0b795ec.zip | |
Merge pull request #14830 from lipis/sort
Sorted various lines using atom/sort-lines
| -rw-r--r-- | .editorconfig | 8 | ||||
| -rw-r--r-- | .gitignore | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/.editorconfig b/.editorconfig index 4228522f9..ff0ad0433 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,12 +3,12 @@ root = true [*] -indent_style = space -indent_size = 2 -end_of_line = lf charset = utf-8 -trim_trailing_whitespace = true +end_of_line = lf +indent_size = 2 +indent_style = space insert_final_newline = true +trim_trailing_whitespace = true [*.py] indent_size = 4 diff --git a/.gitignore b/.gitignore index 465cdb463..84d48d86e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,37 +6,37 @@ _site # Numerous always-ignore extensions *.diff *.err -*.orig *.log +*.orig *.rej *.swo *.swp -*.zip *.vi +*.zip *~ # OS or Editor folders -.DS_Store ._* -Thumbs.db .cache +.DS_Store +.idea .project .settings .tmproj *.esproj -nbproject *.sublime-project *.sublime-workspace -.idea +nbproject +Thumbs.db # Komodo -*.komodoproject .komodotools +*.komodoproject # grunt-html-validation -validation-status.json validation-report.json +validation-status.json # Folders to ignore -node_modules bower_components +node_modules |