박은주 / Todays_Issue

Go to a project
Toggle navigation Toggle navigation pinning
박은주
7f8d86f9 2 parents e29095da 168bb08b

merge

Inline Side-by-side
Showing 1 changed file with 4 additions and 0 deletions
...@@ -14,7 +14,11 @@ def sleeptime(): ...@@ -14,7 +14,11 @@ def sleeptime():
14 14
15 login_info = { 15 login_info = {
16 'userID' : 'id', 16 'userID' : 'id',
17 +<<<<<<< HEAD
17 'userpw' : 'pw' 18 'userpw' : 'pw'
19 +=======
20 + 'userpw' : 'passwd'
21 +>>>>>>> 168bb08b1702cf4a3eb4c5a30b1d08ab900822a6
18 } 22 }
19 23
20 options = webdriver.ChromeOptions() 24 options = webdriver.ChromeOptions()
......