Fix conflicting files

lib/Spot.php

@@ -664,11 +664,6 @@ class Spot extends Main
 
 	public function addPosition($sLat, $sLng, $iTimestamp) {
 		$oFeed = new Feed($this->oDb, $this->oProject->getFeedIds()[0]);
-<<<<<<< HEAD:inc/Spot.php
-		$bResult = ($oFeed->addManualPosition($sLat, $sLng, $iTimestamp) > 0);
-
-		return self::getJsonResult($bResult, $bResult?'':$this->oDb->getLastError());
-=======
 		$bSuccess = ($oFeed->addManualPosition($sLat, $sLng, $iTimestamp) > 0);
 
 		if($bSuccess) {
@@ -678,7 +673,6 @@ class Spot extends Main
 		else $sDesc = 'error.commit_db';
 
 		return self::getJsonResult($bSuccess, $sDesc);
->>>>>>> vue:lib/Spot.php
 	}
 
 	public function getAdminSettings($sType='') {