dot/emacs: Don't automatically stage files after resolving conflicts.

[profile] / dot / e16-bindings

diff --git a/dot/e16-bindings b/dot/e16-bindings
index d1bdbbd..515d031 100644 (file)
--- a/dot/e16-bindings
+++ b/dot/e16-bindings
@@ -27,7 +27,6 @@ Tooltip Display Settings Menu
 Aclass KEYBINDINGS global
 KeyDown   5        F6 exec gconftool --toggle /desktop/gnome/accessibility/keyboard/mousekeys_enable
 KeyDown   5        F7 exec un-backslashify-selection
-KeyDown   5        F8 exec xinitcmd :terminal
 KeyDown   5        F9 exec xinitcmd :ask-run
 KeyDown   5       F10 exec xinitcmd :ask-command
 KeyDown   5       F11 exec lock-screen