XF 1.3 The custom template is out of date but has been edited more recently than the parent. Merging can on

[jauburn]

I upgraded to 1.3.3 and merged the templates--except two. I get this message when I click merge:

The custom template is out of date but has been edited more recently than the parent. Merging can only be done by hand.

How do I resolve that? Thanks.

 

[Paul B]

Are you using a third party style?

The style could be out of date for the version of XenForo you are using.

Failing that, take a copy of your custom edits, revert the template and reapply your edits.

 

[jauburn]

Yes, this is for Soft Responsive, but I'm pretty sure I have the latest version. I'll update it again just in case.