arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-19 14:58:07 +00:00
Code Issues Releases Wiki Activity

Fix a merge error

Browse Source
This commit is contained in:
Julien Duponchelle 2016-03-16 16:40:12 +01:00
parent dd2fdcc574
commit d81fc25b27
No known key found for this signature in database
GPG Key ID: F1E2485547D4595D
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gns3server/hypervisor/vmware/__init__.py
View File

@ -35,10 +35,10 @@ from pkg_resources import parse_version
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
from gns3server.modules.base_manager import BaseManager from gns3server.hypervisor.base_manager import BaseManager
from gns3server.modules.vmware.vmware_vm import VMwareVM from gns3server.hypervisor.vmware.vmware_vm import VMwareVM
from gns3server.modules.vmware.vmware_error import VMwareError from gns3server.hypervisor.vmware.vmware_error import VMwareError
from gns3server.modules.vmware.nio_vmnet import NIOVMNET from gns3server.hypervisor.vmware.nio_vmnet import NIOVMNET
class VMware(BaseManager): class VMware(BaseManager):