From ec9de3e44c124e17c958cbf3fdaf071ef1643d71 Mon Sep 17 00:00:00 2001 From: "sergeyu@chromium.org" Date: Wed, 29 Aug 2012 19:26:26 +0000 Subject: Import getpass in me2me_virtual_host.py This fixes merge conflict between revisions 153647 and 153796. The first change removed import getpass, while the second one depends on it. TBR=jamiewalch@chromium.org Review URL: https://chromiumcodereview.appspot.com/10886041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153945 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/tools/me2me_virtual_host.py | 1 + 1 file changed, 1 insertion(+) (limited to 'remoting/tools') diff --git a/remoting/tools/me2me_virtual_host.py b/remoting/tools/me2me_virtual_host.py index 8ac760a..53a3118 100755 --- a/remoting/tools/me2me_virtual_host.py +++ b/remoting/tools/me2me_virtual_host.py @@ -11,6 +11,7 @@ import atexit import errno +import getpass import hashlib import json import logging -- cgit v1.1