Skip to content

Commit

Permalink
Merge branch 'master' of github.com:vvo/selenium-standalone
Browse files Browse the repository at this point in the history
# Conflicts:
#	lib/microsoft-edge-releases.js
  • Loading branch information
serbanghita committed Jun 18, 2018
2 parents 68470a6 + 73729a8 commit 322f825
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lib/default-config.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module.exports = {
baseURL: 'https://selenium-release.storage.googleapis.com',
version: '3.8.1',
version: '3.12.0',
drivers: {
chrome: {
version: '2.40',
arch: process.arch,
baseURL: 'https://chromedriver.storage.googleapis.com'
},
ie: {
version: '3.9.0',
version: '3.12.0',
arch: process.arch,
baseURL: 'https://selenium-release.storage.googleapis.com'
},
Expand Down
1 change: 0 additions & 1 deletion lib/microsoft-edge-releases.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* You can find them at https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/#downloads
*/
module.exports = {

'16299': {
url: 'https://download.microsoft.com/download/D/4/1/D417998A-58EE-4EFE-A7CC-39EF9E020768/MicrosoftWebDriver.exe',
extension: 'exe'
Expand Down

0 comments on commit 322f825

Please sign in to comment.