From 08df63624e4278ccd74b1b464363279c42c9d152 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 11 Feb 2016 15:32:55 +0000 Subject: [PATCH] Revert "Merge branch 'feature/RM-2685_caveatGroupsView_UI' into 'master'" This reverts commit 8ae74856df060162e2abaf91909422d319b87d83, reversing changes made to 141e84aa3cb4ffd6c0332b45e91c23f5031f4007. --- .editorConfig => rm-community/.editorConfig | 11 ++++++----- .jshintrc => rm-community/.jshintrc | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) rename .editorConfig => rm-community/.editorConfig (84%) rename .jshintrc => rm-community/.jshintrc (99%) diff --git a/.editorConfig b/rm-community/.editorConfig similarity index 84% rename from .editorConfig rename to rm-community/.editorConfig index 1808f3da08..bfe2df82c6 100644 --- a/.editorConfig +++ b/rm-community/.editorConfig @@ -7,9 +7,10 @@ root = true # All files should use spaces. [*] indent_style = space -end_of_line = crlf -trim_trailing_whitespace = true -indent_size = 3 -[*.java] -indent_size = 4 +# Just JS for now. +[*.js] +indent_size = 3 +trim_trailing_whitespace = true + +#TODO: css, xml, ftl, etc. diff --git a/.jshintrc b/rm-community/.jshintrc similarity index 99% rename from .jshintrc rename to rm-community/.jshintrc index 67d44b1766..b68d89a65f 100644 --- a/.jshintrc +++ b/rm-community/.jshintrc @@ -41,4 +41,4 @@ "browser": true, "dojo": true -} +} \ No newline at end of file