From 8c641e8ba7bf76cdffa611791dab1f5614f3297d Mon Sep 17 00:00:00 2001
From: Andreas Bielawski <brawl98@outlook.com>
Date: Wed, 15 Jun 2016 01:31:53 +0200
Subject: [PATCH] Merging funktioniert nie beim ersten Mal

---
 config.lua.example | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config.lua.example b/config.lua.example
index 8ee023f..a4e4eb7 100644
--- a/config.lua.example
+++ b/config.lua.example
@@ -21,7 +21,6 @@ Sende /hilfe, um zu starten
 	-- The symbol that starts a command. Usually noted as '/' in documentation.
 	cmd_pat = '/',
 
-<<<<<<< HEAD:config.lua.example
 	errors = { -- Generic error messages used in various plugins.
 	    generic = 'An unexpected error occurred.',
 		connection = 'Verbindungsfehler.',