diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-08-12 16:17:24 +0200 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-08-12 16:17:24 +0200 |
| commit | 2302bc2473a279ba73fddf7c3dfbc035c4976180 (patch) | |
| tree | 253504d6651c5674a80f1cc1dbf0ee47125661e6 | |
| parent | cf0356f71a26e82fa6354cb65ec9b152e9da8135 (diff) | |
| parent | 1dc2d0e759a622b04c94b089ec980857595fa7bf (diff) | |
| download | forums-2302bc2473a279ba73fddf7c3dfbc035c4976180.tar forums-2302bc2473a279ba73fddf7c3dfbc035c4976180.tar.gz forums-2302bc2473a279ba73fddf7c3dfbc035c4976180.tar.bz2 forums-2302bc2473a279ba73fddf7c3dfbc035c4976180.tar.xz forums-2302bc2473a279ba73fddf7c3dfbc035c4976180.zip | |
Merge branch 'develop-ascraeus' into develop
# By Callum Macrae
# Via Callum Macrae (1) and Dhruv Goel (1)
* develop-ascraeus:
[ticket/12951] Made editorconfig file comments better
[ticket/12951] Added editorconfig
| -rw-r--r-- | .editorconfig | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..0e7d70f2a7 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,18 @@ +# This file is for standardising the coding style between different editors +# http://editorconfig.org/ + +root = true + +[*] +end_of_line = lf +indent_size = 4 +indent_style = tab +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false + +[*.yml] +indent_size = 4 +indent_style = space |