From f0bcbcfa7f07f9dba0828ae5328cd742b4ea1b91 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 25 Jun 2009 16:09:38 +0000
Subject: [PATCH] Remove error about using -L and -S together which was never
 displayed as logging wasn't yet enabled, was unnecessary, and contradicted
 the man page which says using -S will cause -L to be ignored.

---
 tmux.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/tmux.c b/tmux.c
index 4e5ef9fa..c91620a7 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.9 2009/06/23 18:27:40 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.10 2009/06/25 06:40:25 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -246,19 +246,11 @@ main(int argc, char **argv)
 			cfg_file = xstrdup(optarg);
 			break;
 		case 'L':
-			if (path != NULL) {
-				log_warnx("-L and -S cannot be used together");
-				exit(1);
-			}
 			if (label != NULL)
 				xfree(label);
 			label = xstrdup(optarg);
 			break;
 		case 'S':
-			if (label != NULL) {
-				log_warnx("-L and -S cannot be used together");
-				exit(1);
-			}
 			if (path != NULL)
 				xfree(path);
 			path = xstrdup(optarg);