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

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

diff --git a/README.md b/README.md
index 7be3247..ab2634f 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
-<<<<<<< HEAD
 ### Installing:
 =======
 # mcrcon
->>>>>>> develop
 
 mcrcon is console based Minecraft [rcon](https://developer.valvesoftware.com/wiki/Source_RCON_Protocol) client for remote administration and server maintenance scripts.