diff options
author | hut <hut@lavabit.com> | 2010-04-13 12:58:02 +0200 |
---|---|---|
committer | hut <hut@lavabit.com> | 2010-04-13 12:58:02 +0200 |
commit | bcbb7832e669ee5554cf2bbecc8c97f2d18cf27b (patch) | |
tree | 018847529c4f6bc80b88cd9f13a566ca04fb7166 /ranger/gui | |
parent | bec7df57bbf04c8798328cd3b45db2d6c9e54f95 (diff) | |
parent | cf8b174eff6a9e016903d1071289453c8d9407d5 (diff) | |
download | ranger-bcbb7832e669ee5554cf2bbecc8c97f2d18cf27b.tar.gz |
Merge branch 'master' into newkey
Conflicts: ranger/defaults/keys.py
Diffstat (limited to 'ranger/gui')
-rw-r--r-- | ranger/gui/widgets/console.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ranger/gui/widgets/console.py b/ranger/gui/widgets/console.py index a27e1956..3228c511 100644 --- a/ranger/gui/widgets/console.py +++ b/ranger/gui/widgets/console.py @@ -29,7 +29,6 @@ from ranger import log, relpath_conf from ranger.ext.shell_escape import shell_quote from ranger.container.keymap import CommandArgs from ranger.ext.get_executables import get_executables -from ranger.ext.direction import Direction import ranger DEFAULT_HISTORY = 0 |