Merge branch 'master' of github.com:kanaka/noVNC

18232af2 · Joel Martin · b50f3406 · d5575ef6 · 18232af2
Commit 18232af2 authored Jun 23, 2012 by Joel Martin
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

nova-novncproxy utils/nova-novncproxy +1 -1

No files found.
--- a/utils/nova-novncproxy
+++ b/utils/nova-novncproxy
@@ -30,9 +30,9 @@ import wsproxy

 from nova import context
 from nova import flags
-from nova import rpc
 from nova import utils
 from nova.openstack.common import cfg
+from nova.openstack.common import rpc


 opts = [