From 66c4ed98d62010421a47bcdb7a4a22a7cbcffff9 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 10 Sep 2015 14:59:16 +0100
Subject: [PATCH] Fix bad merge.

---
 tmux.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tmux.h b/tmux.h
index 1c643534..61027b98 100644
--- a/tmux.h
+++ b/tmux.h
@@ -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"