Results 1 to 3 of 3

Thread: Failed to merge conflict

Hybrid View

  1. #1

    Default Failed to merge conflict

    When I upgraded to the latest build available this was a merge that failed, is it okay to just dismiss this or should I update the template?

    PHP Code:
    Your Customized Value
    <link rel="stylesheet" type="text/css" href="{vb:raw vbcsspath}threadlist.css" />
    <
    title> {vb:raw vboptions.bbtitle}} - {vb:raw vboptions.arcadename} - {vb:raw game.title}</title>
    Old Default Value
    <link rel="stylesheet" type="text/css" href="{vb:raw vbcsspath}threadlist.css" />
    <
    title>{vb:rawphrase x_powered_by_vbulletin, {vb:raw vboptions.bbtitle}} - {vb:raw vboptions.arcadename} - {vb:raw game.title}</title>
    New Default 
    Value
    {vb:cssfile threadlist.css}
    <
    title>{vb:rawphrase x_powered_by_vbulletin, {vb:raw vboptions.bbtitle}} - {vb:raw vboptions.arcadename} - {vb:raw game.title}</title

  2. #2
    Super Moderator KW802's Avatar
    Join Date
    Mar 2004
    Location
    A galaxy far, far away...
    Posts
    6,606

    Default Re: Failed to merge conflict

    Looks like your modified version was to just change the page title. You'll want to make this change yet...

    OLD:
    Code:
    <link rel="stylesheet" type="text/css" href="{vb:raw vbcsspath}threadlist.css" />
    NEW:
    Code:
    {vb:cssfile threadlist.css}
    ... since the way of including the stylesheets has been changed in vB.

  3. #3

    Default Re: Failed to merge conflict

    Cheers

Thread Information

Users Browsing this Thread

There are currently 1 users browsing this thread. (0 members and 1 guests)

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •