From dff8fa1e3a17d108a344ea48d3decd79b816af45 Mon Sep 17 00:00:00 2001
From: Foghrye4 <foghrye4@gmail.com>
Date: Tue, 19 Apr 2016 21:35:43 +0400
Subject: [PATCH] Removing changes

---
 minetest.conf.example | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/minetest.conf.example b/minetest.conf.example
index 88aacf196..e913140ae 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -253,13 +253,10 @@
 #    type: bool
 # enable_local_map_saving = false
 
-<<<<<<< HEAD
 #    Show entity selection boxes.
 #    type: bool
 # show_entity_selectionbox true
 
-=======
->>>>>>> bca616493783b18b2f280d4773cb4be41d01c434
 #    Enable usage of remote media server (if provided by server).
 #    Remote servers offer a significantly faster way to download media (e.g. textures)
 #    when connecting to the server.