From e3c1f000b97fc550b8c4fb44b71a10262046423f Mon Sep 17 00:00:00 2001
From: PLUJA <64632615+pluja@users.noreply.github.com>
Date: Fri, 4 Sep 2020 12:16:39 +0200
Subject: [PATCH] Update README.md

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7cf7ac8..68b7625 100644
--- a/README.md
+++ b/README.md
@@ -133,10 +133,9 @@ A quick deployment
     
 6. Go to "http://localhost:5000/" and enjoy.
 
-<<<<<<< HEAD
 ### 🔗 Hosting on a server:
 
-#### [VISIT THIS FILE FOR INSTRUCTIONS](https://github.com/pluja/Yotter/SELF-HOSTING.md)
+#### [VISIT THIS FILE FOR INSTRUCTIONS](https://github.com/pluja/Yotter/blob/dev-indep/SELF-HOSTING.md)
 
 ### Updating to newer versions:
 **IMPORTANT: Before updating to newer versions, always export your data on `Settings>Export Data`. A major version update could have changes on the whole database and you may be forced to remove and reset the database (only when running locally)!**