Merge branch 'feature/RM-2685_caveatGroupsView_UI' into 'master'

RM-2686: View Caveat Groups

See merge request !30
This commit is contained in:
David Webster
2016-02-11 11:43:23 +00:00
2 changed files with 5 additions and 6 deletions

View File

@@ -7,10 +7,9 @@ root = true
# All files should use spaces. # All files should use spaces.
[*] [*]
indent_style = space indent_style = space
end_of_line = crlf
# Just JS for now.
[*.js]
indent_size = 3
trim_trailing_whitespace = true trim_trailing_whitespace = true
indent_size = 3
#TODO: css, xml, ftl, etc. [*.java]
indent_size = 4

View File

@@ -41,4 +41,4 @@
"browser": true, "browser": true,
"dojo": true "dojo": true
} }