From aa71347f595b014546e3e2f895006f9d2fea9d7e Mon Sep 17 00:00:00 2001
From: Patrick Gerken <do3cc@patrick-gerken.de>
Date: Mon, 20 Oct 2014 10:20:32 +0200
Subject: [PATCH] Fix merge conflict

---
 plugins/tmuxinator/_tmuxinator | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/tmuxinator/_tmuxinator b/plugins/tmuxinator/_tmuxinator
index e4f8b6ce0..6fdc77bfb 100644
--- a/plugins/tmuxinator/_tmuxinator
+++ b/plugins/tmuxinator/_tmuxinator
@@ -27,7 +27,7 @@ case $state in
   args)
     case $line[1] in
       start|open|copy|delete|debug)
-        _configs=(`find ~/.tmuxinator -name \*.yml | cut -d/ -f5 | sed s:.yml::g`)
+        _configs=(`find -L ~/.tmuxinator -name \*.yml | cut -d/ -f5 | sed s:.yml::g`)
         [[ -n "$_configs" ]] && _values 'configs' $_configs
         ret=0
         ;;