From 36adbe387c01e6d20546759c97dc5df25b3618f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= <dkmaster@dkmon.com>
Date: Tue, 22 Sep 2015 01:04:32 +0200
Subject: [PATCH] Bad resolve fixed

---
 server/src/uds/services/OVirt/OVirtProvider.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/server/src/uds/services/OVirt/OVirtProvider.py b/server/src/uds/services/OVirt/OVirtProvider.py
index 26b2b0dc4..b76d75c6b 100644
--- a/server/src/uds/services/OVirt/OVirtProvider.py
+++ b/server/src/uds/services/OVirt/OVirtProvider.py
@@ -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__)