diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-07-08 10:50:41 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-07-08 10:50:41 -0700 |
| commit | 9a345241a6fc42aad33e6aa4e55765d09a5a37c8 (patch) | |
| tree | f4dbd54784726e3ef9f787121fff47bc69dd07d2 /.idea/codeStyleSettings.xml | |
| parent | 109ec8e5067b26a83814c5f0de977809524b7372 (diff) | |
| download | idea-9a345241a6fc42aad33e6aa4e55765d09a5a37c8.tar.gz | |
Revert "Snapshot d8891a7de15cebb78b6ce5711e50e531b42c0baf from master branch of git://git.jetbrains.org/idea/community.git"
This reverts commit c6218e46d5d2017e987ecdbd99b318a95c42abc0.
Conflicts:
.idea/copyright/profiles_settings.xml
Change-Id: I8bc88b174d7745d6584585a93af5a83714563622
Diffstat (limited to '.idea/codeStyleSettings.xml')
| -rw-r--r-- | .idea/codeStyleSettings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml index 3bb1d821e856..0b13401d8804 100644 --- a/.idea/codeStyleSettings.xml +++ b/.idea/codeStyleSettings.xml @@ -251,6 +251,10 @@ <option name="FOR_BRACE_FORCE" value="1" /> <option name="PARENT_SETTINGS_INSTALLED" value="true" /> </codeStyleSettings> + <codeStyleSettings language="Python"> + <option name="KEEP_LINE_BREAKS" value="false" /> + <option name="PARENT_SETTINGS_INSTALLED" value="true" /> + </codeStyleSettings> <codeStyleSettings language="SQL"> <option name="PARENT_SETTINGS_INSTALLED" value="true" /> </codeStyleSettings> |