Conflict merged
authorOleg Shpynov <oleg.shpynov@jetbrains.com>
Tue, 20 Apr 2010 09:31:24 +0000 (13:31 +0400)
committerOleg Shpynov <oleg.shpynov@jetbrains.com>
Tue, 20 Apr 2010 09:31:24 +0000 (13:31 +0400)
commit0ed27b856a5f6ec5805666c279adb36c6fb93aeb
treeec43ad90c2a6a2d64084b750bd11ce0f96db549d
parentf2a92201ef8b87704c5170ec8e500ed4728d4ba0
parent88f8eef21fce83167a17727867df1a69b3a49649
Conflict merged
platform/lang-impl/src/com/intellij/codeInsight/editorActions/BackspaceHandler.java