Fix conflicting files

lib/index.php

@@ -79,12 +79,6 @@ if($sAction!='')
 						break;
 					case 'add_position':
 						$sResult = $oSpot->addPosition($sLat, $sLng, $iTimestamp);
-<<<<<<< HEAD:index.php
-						break;
-					case 'admin_new':
-						$sResult = $oSpot->createProject();
-=======
->>>>>>> vue:lib/index.php
 						break;
 					case 'admin_get':
 						$sResult = $oSpot->getAdminSettings();