Merging funktioniert nie beim ersten Mal

2016-06-15 01:31:53 +02:00
parent d9d148001f
commit 8c641e8ba7
1 changed files with 0 additions and 1 deletions
--- 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.',