Conflicts while updating CVS

[Harry Hoffman]

Hello All,
    Can anyone tell me how to resolve these conflicts: (I get them while 
updating Horde from CVS)

Thanks,
Harry

 RCS file: /repository/horde/config/registry.php.dist,v
 retrieving revision 1.57
 retrieving revision 1.58
 Merging differences between 1.57 and 1.58 into registry.php.dist
 rcsmerge: warning: conflicts during merge
 cvs server: conflicts found in config/registry.php.dist
 C config/registry.php.dist



-------------------------------------------------
This mail sent through IMP: http://horde.org/imp/