1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-12-23 13:13:24 +01:00

Fix merge conflict

This commit is contained in:
Jfreegman 2015-12-01 18:01:02 -05:00
parent 1d1c051a44
commit fe0eba9107
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63

View File

@ -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 */