myconfig

commit 3fa55050c9d7db36e484fcb80dd45ebe09221fa3
parent a67d13863d448493d4829de0f8ef7370001fd7df
Author: Antoine Amarilli <a3nm@a3nm.net>
Date:   Tue, 25 Mar 2014 09:12:42 +0100

fix crap in i3

Diffstat:
i3/config
 | 
4
----

1 file changed, 0 insertions(+), 4 deletions(-)
diff --git a/i3/config b/i3/config
@@ -109,12 +109,8 @@ bindsym $mod+Shift+R restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+greater exit
 
-<<<<<<< Updated upstream
-bindsym $mod+x exec ~/bin/afk
-=======
 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)
 mode "resize" {