mirror of
https://github.com/Tha14/toxic.git
synced 2024-11-23 01:03:02 +01:00
Fix merge conflict
This commit is contained in:
parent
1d1c051a44
commit
fe0eba9107
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user