[eluser]Derek Jones[/eluser]
[quote author="John_Betong" date="1252739523"]
Many thanks to all at Ellis Labs, it is magic, works first time, no hitches and now on my joke site.
I am curious to know about this syntax error on the SVN At revision: 1738
./codeigniter/CodeIgniter.php
Code:
// CI Version
<<<<<<< .mine
// define('CI_VERSION', '1.7.1');
define('CI_VERSION', '1.7.2 (svn)');
=======
define('CI_VERSION', '1.7.2');
>>>>>>> .r1738
[/quote]
You seem to have modified your checkout, so you'll need to resolve the conflict (revert or filemerge), but I do not understand what you're asking about a syntax error?