From 7a2706c83c594812d9cb402b29881d6eef2580c2 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sun, 12 Mar 2017 19:04:34 +0100
Subject: discordbot: fix bad merge

---
 discordbot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/discordbot b/discordbot
index 4969a01..413820d 160000
--- a/discordbot
+++ b/discordbot
@@ -1 +1 @@
-Subproject commit 4969a01045abbc696bed0195901f47ace4db0c9d
+Subproject commit 413820d53747043823bc110efb281ec7669d9f75
-- 
cgit v1.3.1