slapos_cloud: fixup rebase

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudInteractionWorkflow.py

@@ -20,6 +20,7 @@
 ##############################################################################
 from erp5.component.test.SlapOSTestCaseMixin import SlapOSTestCaseMixin
 
+
 class TestSlapOSCoreSlapOSCloudInteractionWorkflow(SlapOSTestCaseMixin):
 
   def test_ComputeNode_setSubjectList(self):
@@ -191,15 +192,11 @@ class TestSlapOSCoreSlapOSCloudInteractionWorkflow(SlapOSTestCaseMixin):
     compute_node = self.portal.compute_node_module.newContent(
       portal_type='Compute Node',
       title="Compute Node %s for %s" % (new_id, self.person_user.getReference()),
-<<<<<<< HEAD
-      reference="TESTCOMP-%s" % new_id)
-    self._addCertificateLogin(compute_node)
-=======
       reference="TESTCOMP-%s" % new_id,
       follow_up_value=project
     )
-    self._addERP5Login(compute_node)
->>>>>>> 1561dc0c2 (slapos_cloud: assignment needed to touch compute node)
+    self._addCertificateLogin(compute_node)
+
     partition = compute_node.newContent(
       portal_type='Compute Partition',
       title="Partition Compute Node %s for %s" % (new_id,