summaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorEric Lin <anselor@gmail.com>2018-05-02 14:53:20 -0400
committerEric Lin <anselor@gmail.com>2018-05-02 14:53:20 -0400
commita95c8a065abeac286c196783393ecc49e4356f54 (patch)
treeb4575eda772450b54620d16c09d4d29c52abdec7 /tests/conftest.py
parentd2d3c2f37d5324b5bc967fe268a92f9d563a3a30 (diff)
parent148f05d0af66f38c8ba6ca3a5619f50a8bb1b8a9 (diff)
downloadcmd2-git-a95c8a065abeac286c196783393ecc49e4356f54.tar.gz
Merge branch 'bash_completion' into bash_to_pyscript
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 90d45bd9..562ca4fa 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -10,7 +10,7 @@ import sys
from pytest import fixture
from unittest import mock
-import cmd2
+from cmd2 import cmd2
# Prefer statically linked gnureadline if available (for macOS compatibility due to issues with libedit)
try: