Fix bad merge.

This commit is contained in:
Nicholas Marriott 2015-09-10 14:59:16 +01:00
parent eb1084754c
commit 66c4ed98d6

3
tmux.h
View File

@ -39,9 +39,6 @@
extern char *__progname;
extern char **environ;
extern char *__progname;
extern char **environ;
/* Default global configuration file. */
#define TMUX_CONF "/etc/tmux.conf"