fix after merge
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 18 Jul 2016 15:16:52 +0000 (17:16 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Mon, 18 Jul 2016 15:16:52 +0000 (17:16 +0200)
commit4b72d49306338642e8057adcbb96cff9055031d0
treebca8c5dcaed9a1370b38a0f64f1606edc7d4fd5a
parent344c6071aa905a6777c20639c2422c98fd67e774
fix after merge
platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java