update to RC1/2, unmodified files

[rikpotts]

I used to have a working ms2 install.

 

Then I updated to RC1 and all seemed well.

 

Then I updated to RC2 and it all went belly up. So im having a second go at it.

 

Ive noticed that there are some unmodified files from the original ms2 install which have have ammendments to be applied to complete the RC2 install. After I have made these ammendments the two files are different still.

 

ie

/admin/includes/general.js

To bring this file to RC2 I have to add code between lines 34 and 51. Baring in mind I have never touched this file before and it isn't included in the RC1 update im concerned that there are loads of differences between my updated ms2 file and the general.js that is included in the oscommerece rc2 download (for initial installation)

 

Here are the differences

 

Should I ignore the differeces or make them the same?

[rikpotts]

Ive sorted it now. RC2 :)