From fe0eba9107b480141ba2a6b2b0fb9b451981a7e5 Mon Sep 17 00:00:00 2001
From: Jfreegman <jfreegman@gmail.com>
Date: Tue, 1 Dec 2015 18:01:02 -0500
Subject: [PATCH] Fix merge conflict

---
 src/chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chat.c b/src/chat.c
index 97070fd..e241b56 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -66,7 +66,7 @@ static void kill_infobox(ToxWindow *self);
 #endif  /* AUDIO */
 
 #ifdef AUDIO
-#define AC_NUM_CHAT_COMMANDS 30
+#define AC_NUM_CHAT_COMMANDS 31
 #else
 #define AC_NUM_CHAT_COMMANDS 23
 #endif /* AUDIO */