mirror of
https://github.com/Tha14/toxic.git
synced 2025-06-20 09:36:36 +02:00
Fix merge conflict
This commit is contained in:
@ -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 */
|
||||||
|
Reference in New Issue
Block a user