From e1be234af48ba88e8b8388524acc1c94c55b03d9 Mon Sep 17 00:00:00 2001
From: Akamaru <akamaru92@live.de>
Date: Sun, 28 Aug 2016 18:39:42 +0200
Subject: [PATCH] Merge Upstream

---
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 29e0f9d..118ee55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,6 @@ config.lua
 *.db
 tg
 tmp/*
-miku/plugins/licht.lua
-Bot-Kommandoliste.txt
+miku/plugins/licht.lua
+Bot-Kommandoliste.txt
 msg.txt
\ No newline at end of file