commit 84e002280221eda593894218ba86b521a1727e44
parent 33207f75ad3d266d640459d264e8e18bbdce7a8e
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Fri, 4 Oct 2013 00:42:47 +0200
use bin
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/i3/config b/i3/config
@@ -112,8 +112,8 @@ bindsym $mod+Shift+greater exit
<<<<<<< Updated upstream
bindsym $mod+x exec ~/bin/afk
=======
-bindsym $mod+x exec ~/scripts/afk
-bindsym $mod+Shift+x exec ~/scripts/dodo
+bindsym $mod+x exec ~/bin/afk
+bindsym $mod+Shift+x exec ~/bin/dodo
>>>>>>> Stashed changes
# resize window (you can also use the mouse for that)