Parse error: syntax error, unexpected T_SL in public_html/****.com/sites/all/themes/basic/theme-settings.php on line 61

Happens when I try to edit the appearance settings.

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

nesta_’s picture

Priority: Normal » Critical
Status: Active » Patch (to be ported)
FileSize
1.07 KB

Solved.

joelpittet’s picture

Status: Patch (to be ported) » Needs review
FileSize
2.79 KB
2.08 KB

There was a <<<<<<< HEAD in there as well.

Attached is the interdiff from nguerrero's patch

joelpittet’s picture

Title: Problem! » Bad merge reminences commited by accident.
joelpittet’s picture

Status: Needs review » Fixed

Fixed in commit 0b8c42c29a4b1396fdb3a4d4133993f1ff447515

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.