From e293193dd73ff1afa0b2bd02fdd224463366cf7f Mon Sep 17 00:00:00 2001
From: Franzz <francois@lutran.fr>
Date: Sun, 10 May 2026 15:45:25 +0200
Subject: [PATCH] Fix conflicting files

---
 lib/Spot.php  | 6 ------
 lib/index.php | 6 ------
 readme.md     | 9 ---------
 3 files changed, 21 deletions(-)

diff --git a/lib/Spot.php b/lib/Spot.php
index dfef49c..e61f524 100755
--- a/lib/Spot.php
+++ b/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='') {
diff --git a/lib/index.php b/lib/index.php
index c47b9b3..df67ef2 100755
--- a/lib/index.php
+++ b/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();
diff --git a/readme.md b/readme.md
index 6b02abb..6f5a498 100644
--- a/readme.md
+++ b/readme.md
@@ -25,14 +25,6 @@
 ## Getting started
 
 1. Clone Git onto web server
-<<<<<<< HEAD
-2. Install dependencies & update php.ini parameters
-3. Copy timezone data: mariadb_tzinfo_to_sql /usr/share/zoneinfo | mariadb -u root mysql
-4. Copy settings-sample.php to settings.php and populate
-5. Go to #admin and create a new project, feed & maps
-6. Add a GPX file named <project_codename>.gpx to /geo/
-7. Run composer install
-=======
 2. composer install
 3. npm install webpack
 4. npm run dev
@@ -42,7 +34,6 @@
 8. Go to #admin and create a new project, feed & maps
 9. Add a GPX file named <project_codename>.gpx to /geo/
 
->>>>>>> vue
 ## To Do List
 
 * Add mail frequency slider