From 546366b282b6076eb3c530e1eb3e5210d801934a Mon Sep 17 00:00:00 2001
From: Raphael Khaiat <raphael@khaiat.org>
Date: Thu, 18 Nov 2010 19:48:18 +0100
Subject: [PATCH] Merge master in bacardi55 branch

---
 src/wmfs.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/wmfs.c b/src/wmfs.c
index 0de8af5..d21fa2c 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -286,12 +286,7 @@ uicb_reload(uicb_t cmd)
 
      for(; argv_global[0] && argv_global[0] == ' '; ++argv_global);
 
-<<<<<<< HEAD
      execvp(argv_global, all_argv);
-=======
-     /* add -C to always load the same config file */
-     execlp(argv_global, argv_global, "-C", conf.confpath, NULL);
->>>>>>> master
 
      return;
 }