Fix conflicting files

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