Repair Bulk_operations.py file

2016-09-15 16:24:53 +02:00 · 2016-09-15 16:24:53 +02:00 · 605550b315
parent c5d486d7d5
commit 605550b315
1 changed files with 0 additions and 10 deletions
--- a/tests/console/Bulk_operations.py
+++ b/tests/console/Bulk_operations.py
@ -257,15 +257,5 @@ class Bulk_operations(PandoraWebDriverTestCase):

 		self.assertRegexpMatches(self.close_alert_and_get_its_text(), r"^Are you sure[\s\S]$")

-<<<<<<< HEAD
-=======
-		search_module (driver,agent_name_1,module_name_1)
-
-
-		
-
-
-
->>>>>>> 7d1de5c... Add changes in Bulk_operations.py and extend search_module function
 if __name__ == "__main__":
        unittest.main()