Fix for the gui.analyses.wizard module for a bad merger at r20165.
Somehow svnmerge.py did not mark this file as being in conflict when it should have.
Authored by: bugman 2013-06-16
Parent: [r20170]
Child: [r20172]
