diff options
| author | Panayiotis Lipiridis <lipiridis@gmail.com> | 2014-10-20 03:50:59 +0400 |
|---|---|---|
| committer | Panayiotis Lipiridis <lipiridis@gmail.com> | 2014-10-22 16:06:09 +0400 |
| commit | aa8269cfb6a251db60c3a86eb761650ecd81aefc (patch) | |
| tree | 3c870b159ff9cb67e24faf1bf7f31cddce5e39f4 | |
| parent | 8a6a253355ab1d26865bfbfffaa2a194e173a3aa (diff) | |
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 4228522f9d..ff0ad0433c 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 465cdb4633..84d48d86e2 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 |