diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
| commit | b5fb31ef6a38f19404859755dbd2e345215b97bf (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /images/src/org/intellij/images/options/impl/OptionsManagerImpl.java | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | e782c57d74000722f9db4c9426317410520670c6 (diff) | |
| download | idea-b5fb31ef6a38f19404859755dbd2e345215b97bf.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/libraries/asm_tools.xml
.idea/libraries/bouncy_castle.xml
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml
.idea/libraries/easymock_tools.xml
.idea/libraries/freemarker_2_3_20.xml
.idea/libraries/guava_tools.xml
.idea/libraries/kxml2.xml
.idea/libraries/lombok_ast.xml
.idea/libraries/mockito.xml
.idea/modules.xml
.idea/vcs.xml
build/scripts/layouts.gant
updater/src/com/intellij/updater/Runner.java
Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12
Diffstat (limited to 'images/src/org/intellij/images/options/impl/OptionsManagerImpl.java')
| -rw-r--r-- | images/src/org/intellij/images/options/impl/OptionsManagerImpl.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java b/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java index 50edd78feab0..146655408931 100644 --- a/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java +++ b/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java @@ -28,11 +28,8 @@ import org.jdom.Element; * @author <a href="mailto:aefimov.box@gmail.com">Alexey Efimov</a> */ @State( - name = "Images.OptionsManager", - roamingType = RoamingType.DISABLED, - storages = { - @Storage(file = StoragePathMacros.APP_CONFIG + "/images.support.xml") - } + name = "Images.OptionsManager", + storages = {@Storage(file = StoragePathMacros.APP_CONFIG + "/images.support.xml", roamingType = RoamingType.DISABLED)} ) final class OptionsManagerImpl extends OptionsManager implements PersistentStateComponent<Element> { private final OptionsImpl options = new OptionsImpl(); |