From 605550b315caba69d32cf11e7b0f77bcd2b46894 Mon Sep 17 00:00:00 2001 From: cesar991 Date: Thu, 15 Sep 2016 16:24:53 +0200 Subject: [PATCH] Repair Bulk_operations.py file --- tests/console/Bulk_operations.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/console/Bulk_operations.py b/tests/console/Bulk_operations.py index 71d92d756e..cd438ed44a 100644 --- 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()