victorg
committed
on 15 Apr 05
removing logresolvemerge.pl in order to change permissions