Upgrade Complete, Questions about templates with attempted merges
 

I have several templates with custom code, such as the footer. Red message says

The attempted merge failed due to conflicts

My options are
Edit
View
Revert


How do I fix this? I would like to just go with all the new default values, then add back in my custom code where necessary.

Thanks!
Kim

--------------- Added [DATE]1362042677[/DATE] at [TIME]1362042677[/TIME] ---------------

I figured out how to edit, I manually added in the code for the new default in the locations indicated in the comparison.

I have unclosed tags in my footer template.

I copied the code to dreamweaver and it shows me a syntax error on line 51

var tzOffset = {vb:raw bbuserinfo.timezoneoffset} {vb:raw bbuserinfo.


Does anyone see anything odd about the above code? Thanks

Should of reverted then added your custom code again this way no problems

Reverting all custom templates fixed the appearance of the CSS Problem. Thanks!