DivineMessenger
02-21-2010, 07:37 PM
Step 7) Merge template changes
Merged template successfully: header (style: 7)
Merged template successfully: editor.css (style: 8)
Conflict when merging template: FORUMHOME (style: 8)
Conflict when merging template: header (style: 8)
Conflict when merging template: headinclude (style: 8)
Conflict when merging template: navbar (style: 8)
Conflict when merging template: usercp.css (style: 8)
How do I fix this?
Merged template successfully: header (style: 7)
Merged template successfully: editor.css (style: 8)
Conflict when merging template: FORUMHOME (style: 8)
Conflict when merging template: header (style: 8)
Conflict when merging template: headinclude (style: 8)
Conflict when merging template: navbar (style: 8)
Conflict when merging template: usercp.css (style: 8)
How do I fix this?