diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
| commit | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (patch) | |
| tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java | |
| parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
| parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
| download | idea-060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
build/scripts/tests.gant
Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784
Diffstat (limited to 'platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java')
| -rw-r--r-- | platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java index 20b96cac3920..299d17215fdf 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java @@ -287,7 +287,6 @@ public class CommonCodeStyleSettings { //----------------- GENERAL -------------------- public int RIGHT_MARGIN = -1; - public final static int DEFAULT_RIGHT_MARGIN = 120; public boolean LINE_COMMENT_AT_FIRST_COLUMN = true; public boolean BLOCK_COMMENT_AT_FIRST_COLUMN = true; |