mirror of
https://github.com/dkmstr/openuds.git
synced 2024-12-22 13:34:04 +03:00
Bad resolve fixed
This commit is contained in:
parent
df2dcf7acd
commit
36adbe387c
@ -45,11 +45,7 @@ from .client import oVirtClient
|
||||
|
||||
import logging
|
||||
|
||||
<<<<<<< HEAD
|
||||
__updated__ = '2015-09-12'
|
||||
=======
|
||||
__updated__ = '2015-09-21'
|
||||
>>>>>>> origin/v1.9
|
||||
__updated__ = '2015-09-22'
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user