From d81fc25b2757e9375f040e7b5f6988464a9b9dd5 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Wed, 16 Mar 2016 16:40:12 +0100 Subject: [PATCH] Fix a merge error --- gns3server/hypervisor/vmware/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gns3server/hypervisor/vmware/__init__.py b/gns3server/hypervisor/vmware/__init__.py index 2b1b146d..04ddcaa0 100644 --- a/gns3server/hypervisor/vmware/__init__.py +++ b/gns3server/hypervisor/vmware/__init__.py @@ -35,10 +35,10 @@ from pkg_resources import parse_version log = logging.getLogger(__name__) -from gns3server.modules.base_manager import BaseManager -from gns3server.modules.vmware.vmware_vm import VMwareVM -from gns3server.modules.vmware.vmware_error import VMwareError -from gns3server.modules.vmware.nio_vmnet import NIOVMNET +from gns3server.hypervisor.base_manager import BaseManager +from gns3server.hypervisor.vmware.vmware_vm import VMwareVM +from gns3server.hypervisor.vmware.vmware_error import VMwareError +from gns3server.hypervisor.vmware.nio_vmnet import NIOVMNET class VMware(BaseManager):