Akamaru/Mikubot-2
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merging funktioniert nie beim ersten Mal

Browse Source
This commit is contained in:
Andreas Bielawski 2016-06-15 01:31:53 +02:00
parent d9d148001f
commit 8c641e8ba7
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.lua.example
View File

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