fix after merge
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 7 Jul 2016 13:08:24 +0000 (15:08 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 7 Jul 2016 13:08:24 +0000 (15:08 +0200)
commitb4b3250e6b2b0b3fe75b3de355ae0c160cc3fcfe
treea439979526bbc534b3a48800aca1866fa52fb49c
parent91c2d0050756f0f92cb7c1197dbb9fe56d76b6a4
fix after merge
platform/configuration-store-impl/src/StateStorageManagerImpl.kt
platform/lang-impl/src/com/intellij/codeInspection/ex/EditInspectionToolsSettingsAction.java