XF 1.2 Merging can only be done by hand

[florencia]

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

what do I need to do to merge by hand? I'm not a code expert. There isn't any addon for this?

 

[tommydamic68]

Good idea @Martok - that should be in the instructions that came in the box...

Luck…?

<!--Conversation under avatar start-->
        <xen:if is="{$canStartConversation}">
                                <dl><dd><a class="convo-icon" href="{xen:link 'conversations/add', '', 'to={$user.username}'}">{xen:phrase start_conversation}</a></dd></dl>
                            </xen:if>
                            <!--Conversation under avatar end-->

New management system has started…thanks @Brogan!

 

[tommydamic68]

I had a template that was outdated from an old gallery add on i have uninstalled, i reverted it, but, should I still have a template left after an uninstall of an add on?