Showing
1 changed file
with
0 additions
and
4 deletions
... | @@ -14,11 +14,7 @@ def sleeptime(): | ... | @@ -14,11 +14,7 @@ def sleeptime(): |
14 | 14 | ||
15 | login_info = { | 15 | login_info = { |
16 | 'userID' : 'id', | 16 | 'userID' : 'id', |
17 | -<<<<<<< HEAD | ||
18 | - 'userpw' : 'pw' | ||
19 | -======= | ||
20 | 'userpw' : 'passwd' | 17 | 'userpw' : 'passwd' |
21 | ->>>>>>> 168bb08b1702cf4a3eb4c5a30b1d08ab900822a6 | ||
22 | } | 18 | } |
23 | 19 | ||
24 | options = webdriver.ChromeOptions() | 20 | options = webdriver.ChromeOptions() | ... | ... |
-
Please register or login to post a comment