1. This site uses cookies. By continuing to use this site, you are agreeing to our use of cookies. Learn More.

XF 1.3 Merge Template Changes

Discussion in 'Installation, Upgrade, and Import Support' started by Gazhyde, Feb 28, 2014.

  1. Gazhyde

    Gazhyde Well-Known Member

    Just trying the 1.3RC1 upgrade on my dev installation, and get this in PAGE_CONTAINER.

    Which is the correct option to choose?

    upload_2014-2-28_13-33-16.png
     
  2. Mike

    Mike XenForo Developer Staff Member

    It's not that simple. When a conflict comes up you need to determine what has changed and possibly manually modify the contents. That's the case here. I think it's just the "NoJs" part that needs to be added to the custom version.
     
    trizz likes this.
  3. Gazhyde

    Gazhyde Well-Known Member

    Thanks Mike!
     

Share This Page