Merge branch 'format-fix' of https://github.com/fitermay/intellij-community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 30 Aug 2016 16:44:51 +0000 (18:44 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 30 Aug 2016 16:44:51 +0000 (18:44 +0200)
commit1420c95ba5ae227c2584372c280b7c5fd91773bf
tree72f2ea17705a18459f87a969066518b224544362
parent597fe4abedef12b898153dc6f1b3dd982e895679
parenta7a51e1aee70f659ce01b0b243dd2c1566c1d2c3
Merge branch 'format-fix' of https://github.com/fitermay/intellij-community