NACK
You have unmerged changes in the patch
On 08/24/2015 02:14 PM, Lenka Doudova wrote:
from ipatests.test_xmlrpc import objectclasses
+<<<<<<< HEAD
from ipatests.test_xmlrpc.xmlrpc_test import (
Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_set_ci, add_sid, add_oc)
+=======
+from xmlrpc_test import (Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_set_ci,
+ add_sid, add_oc, XMLRPC_test, raises_exact)
+>>>>>>> Automated test for stageuser plugin
from ipapython.dn import DN
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
