Hi There,
I am getting this error in setting.php on dev environment after commiting the security updates using Drush. Please help.
Parse error: syntax error, unexpected '<<' (T_SL) in C:\Users\ithraAdmin\Sites\devdesktop\ithra11-dev\docroot\sites\default\settings.php on line 517The associated code is as below
// <DDSETTINGS>
// Please don't edit anything between <DDSETTINGS> tags.
// This section is autogenerated by Acquia Dev Desktop.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
if (isset($_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR']) && file_exists($_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR'] . '/cld_devcloud_ithra1_dev_default.inc')) {
require $_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR'] . '/cld_devcloud_ithra1_dev_default.inc';
=======
if (isset($_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR']) && file_exists($_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR'] . '/loc_prod_dd.inc')) {
require $_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR'] . '/loc_prod_dd.inc';
>>>>>>> origin/master
=======
if (isset($_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR']) && file_exists($_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR'] . '/loc_prod_dd.inc')) {
require $_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR'] . '/loc_prod_dd.inc';
>>>>>>> origin/master
=======
if (isset($_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR']) && file_exists($_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR'] . '/loc_kingabdulazizcenter_dd.inc')) {
require $_SERVER['DEVDESKTOP_DRUPAL_SETTINGS_DIR'] . '/loc_kingabdulazizcenter_dd.inc';
>>>>>>> parent of 2976d5d... 24 Oct 2016 Settings
}
// </DDSETTINGS>Many Thanks,
Status:
Unresolved