/var/www/modules/listing/listing_location/listing_location.module on line 598
598: <<<<<<< HEAD
if ($_SESSION['listings']['targeted_search'.$save] == 'all-cities') {
=======
if ($_SESSION['listings']['targeted_search'.$save] == 'all cities') {
>>>>>>> 6f822daaac212ad347e191aefe52e9b19ec2243a

Comments

NewZeal’s picture

NewZeal commented

Yeah, sorry about that. I'm still getting my head around git. It seems to allow conflicted files to be uploaded to the server. The above is a registered conflict.

Git is not updating the repository. The old CVS system was so good. Git is fraught with problems. I'm not sure whether or not I can be bothered persevering with it.

Finally after 4 attempts I managed to get the repository to update. Latest version is beta12.