Invalid Dima's merge result fixed. When I say remove changes, then you can just copy over file version prior to your changes.
11 Feb 09 Alex 11393
Removed EditorPick from DB_eh
10 Feb 09 Dmitry Andrejev [Intechnic] 11387
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.