diff options
| author | hut <hut@lavabit.com> | 2010-06-09 14:10:06 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-06-09 14:10:06 +0200 |
| commit | a4c9208bb69b09207c017ae88c810ef0ee83a780 (patch) | |
| tree | 1666c23d6d69481587d26669c790b278123b1f0a /test/tc_history.py | |
| parent | 1d895690f81f2cb3a308416c29b280e91e681e36 (diff) | |
| parent | e74222ee48435895a636812f908c862f3fb7acb6 (diff) | |
| download | ranger-a4c9208bb69b09207c017ae88c810ef0ee83a780.tar.gz | |
Merge branch 'master' into preview
Conflicts: ranger/fsobject/file.py
Diffstat (limited to 'test/tc_history.py')
| -rw-r--r-- | test/tc_history.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/tc_history.py b/test/tc_history.py index d027231a..33784e14 100644 --- a/test/tc_history.py +++ b/test/tc_history.py @@ -13,8 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -if __name__ == '__main__': from __init__ import init; init() - from ranger.container import History from unittest import TestCase, main import unittest |