Need to merge after update.. Please help..

[tgra]

After upgrading to the latest version of SugarCRM I get this message in the Tasks:

Please use whichever diff method is most familiar to you to merge these files. Until this is complete, your SugarCRM installation will be in an uncertain state, and the upgrade is not complete.

Backups of Overwritten Files are in the following directory:
/var/www/html/crm/cache/upload/upgrades/patch/sugarOS-asterisk4.5.0b_1.3-restore

Manually merge the following files:


/var/www/html/crm/modules/Users/EditView.html
/var/www/html/crm/modules/Users/DetailView.html

How do I do this? Running Centos (linux).

Thomas..

[Farias]

I am having the same doubt, and I was wondering if someone can help.

Thank you.