hi
i updated today via bzr (cronjob)
and now when i look at my demo.site i get this error:
Parse error: syntax error, unexpected T_SL in /var/www/html/mix/sites/all/modules/ubercart/uc_cart/uc_cart.module on line 1779
which is referring to this line:
<<<<<<< TREE
=======
unset($_SESSION['new_user']);
if (module_exists('workflow_ng')) {
workflow_ng_invoke_event('checkout_complete', $order);
}
>>>>>>> MERGE-SOURCEafter hashing the naughty lines (i presume its bzr syntax) i get this:
Fatal error: Call to undefined function user_access() in /var/www/html/mix/modules/block/block.module on line 68thanks
ps. where am i supposed to write this stuff up?




Joined: 10/07/2007