From 0ca8cc220413be058e2027189fdba2b49476ce52 Mon Sep 17 00:00:00 2001
From: Kanti <git@kanti.de>
Date: Wed, 22 Apr 2015 15:50:33 +0200
Subject: [PATCH] Update README.md

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 7a22ee3..1cda20f 100644
--- a/README.md
+++ b/README.md
@@ -127,11 +127,7 @@ server {
 
 Both Online or Offline
 ----------------------
-<<<<<<< HEAD
-The built-in editor found in the admin panel, also provides you the ability to write to Markdown files offline by uploading them (see naming convention below) into the `content/username/blog` folder (the `username` must match `YourUsername.ini` above).
-=======
 The built-in editor found in the admin panel, also provides you the ability to write to Markdown files offline by uploading them (see naming convention below) into the `content/username/blog` folder (the `username` must match `YourUsername.ini` above). 
->>>>>>> 1fda3d7a35f0fc4d6251bb0f6eb1782647986064
 
 For static pages you can upload it to the `content/static` folder.