From 0d11c6a4e986c17d0a99b66d713757df54f67fa6 Mon Sep 17 00:00:00 2001
From: Tiiffi <Tiiffi@users.noreply.github.com>
Date: Thu, 2 Jan 2020 02:40:05 +0200
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index 0d0ab18..300695a 100644
--- a/README.md
+++ b/README.md
@@ -63,13 +63,8 @@ Example:
 
 ---
 
-<<<<<<< HEAD
-### Enable rcon on server
-Remember to enable rcon by adding following lines to ```server.properties``` file.
-=======
 ##### Enable rcon on server
 Remember to enable rcon by adding following lines to [```server.properties```](https://minecraft.gamepedia.com/Server.properties) file.
->>>>>>> develop
 ```
 enable-rcon=true
 rcon.port=25575
@@ -78,11 +73,7 @@ rcon.password=your_rcon_pasword
 
 ---
 
-<<<<<<< HEAD
-#### Contact:
-=======
 ##### Contact:
->>>>>>> develop
 
 * WWW:            https://github.com/Tiiffi/mcrcon/
 * MAIL:           tiiffi at gmail