Commit a8707e48 by Michael DeHaan

Fix merge issue

parent c00699d0
...@@ -27,6 +27,7 @@ import random ...@@ -27,6 +27,7 @@ import random
import traceback import traceback
import tempfile import tempfile
import base64 import base64
import getpass
import ansible.constants as C import ansible.constants as C
import ansible.connection import ansible.connection
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment