Comment 6 for bug 653031

Ok, so, I'm looking at bug #646961 which may or not be a duplicate of this one depending on: is main_control.opj a text file that was involved in a text conflict or was it involved in a path conflict instead ?

It's a dupe it's the former.