codeintel: merge failure deleted a member variable
http://bugs.activestate.com/show_bug.cgi?id=99811
fixup for r80877 (IDE) / r13243 (edit)

(integrated from komodo (trunk) change 80904 by marky)

git-svn-id: https://svn.openkomodo.com/repos/openkomodo/trunk@13245 b87d16e7-d29f-4ee1-b5ec-817d645d335f