slapos_erp5: fixup rebase

master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSAuthenticationPolicy.py

@@ -212,8 +212,7 @@ class TestSlapOSAuthenticationPolicyL(SlapOSTestCaseMixin):
       document=person,
       login_portal_type="ERP5 Login")
 
-<<<<<<< HEAD
-=======
+
   def test_expire_ERP5Login_without_password_on_compute_node(self):
     self._test_expire_when_passoword_is_set(
       document=self._makeComputeNode(self.addProject())[0],
@@ -225,7 +224,6 @@ class TestSlapOSAuthenticationPolicyL(SlapOSTestCaseMixin):
       document=self._makeDummySoftwareInstance(),
       login_portal_type="ERP5 Login")
 
->>>>>>> df93206e7 (slapos_erp5: project needed when create person/compute node)
   def test_expire_CertificateLogin_without_password_on_person(self):
     person = self.makePerson(self.addProject(), user=0)
     person.edit(