Merge branch 'master' of http://178.32.216.95:3000/aahmad/groupe3

main.py

@@ -1,4 +1,19 @@
+<<<<<<< HEAD
 ##### IMPORT
+=======
+##### IMPORT 
+import pytest
+import logging as log
+import time
+from selenium import webdriver 
+from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.common.exceptions import TimeoutException
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support.ui import Select
+from selenium.webdriver.firefox.options import Options
+>>>>>>> 0b712e16e7065a3f6d3ef5a8c7ef412d1214562a
 
 
 ##### MANEL