Code review comment for lp://staging/~mefrio-g/scratch/fix-1258260

Yes, now it works as expected :) Just the code style issues and the conflict left then.

To resolve the conflict, first merge with trunk:
bzr merge lp:scratch

which should give you:
Text conflict in plugins/outline/ValaSymbolResolver.vala
1 conflicts encountered.

After that, open plugins/outline/ValaSymbolResolver.vala and edit it so that it looks good (i.e. remove line 167-183 in this case)

After that, mark all conflicts as resolved:
bzr resolve

and commit the changes:
bzr commit -m "Merge changes from lp:scratch"