Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 01:23:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix merge conflict

Browse Source
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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat.c
View File

@ -66,7 +66,7 @@ static void kill_infobox(ToxWindow *self);
#endif /* AUDIO */ #endif /* AUDIO */
#ifdef AUDIO #ifdef AUDIO
#define AC_NUM_CHAT_COMMANDS 30 #define AC_NUM_CHAT_COMMANDS 31
#else #else
#define AC_NUM_CHAT_COMMANDS 23 #define AC_NUM_CHAT_COMMANDS 23
#endif /* AUDIO */ #endif /* AUDIO */