diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-10 11:39:27 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-10 11:39:27 +0100 |
| commit | 974a481d12bf430891725bd3662876358e57e11a (patch) | |
| tree | cad011151456251fef2f1b8d02ef4b4e45fad61a /testing/runtimes | |
| parent | 6bd66b1728eeddb058066edda740aaeb2ceaec23 (diff) | |
| parent | 736d25cbec4541186ed46c935c117ce4d1c7f3bb (diff) | |
| download | UXP-974a481d12bf430891725bd3662876358e57e11a.tar UXP-974a481d12bf430891725bd3662876358e57e11a.tar.gz UXP-974a481d12bf430891725bd3662876358e57e11a.tar.lz UXP-974a481d12bf430891725bd3662876358e57e11a.tar.xz UXP-974a481d12bf430891725bd3662876358e57e11a.zip | |
Merge branch 'master' into js-modules
# Conflicts:
# modules/libpref/init/all.js
Diffstat (limited to 'testing/runtimes')
| -rw-r--r-- | testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json | 1 | ||||
| -rw-r--r-- | testing/runtimes/mochitest-browser-chrome.runtimes.json | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json b/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json index 211e98e05..8525931bd 100644 --- a/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json +++ b/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json @@ -76,7 +76,6 @@ "browser/base/content/test/general/browser_fullscreen-window-open.js": 4312, "browser/base/content/test/general/browser_fxa_oauth.js": 5410, "browser/base/content/test/general/browser_fxa_web_channel.js": 4727, - "browser/base/content/test/general/browser_fxaccounts.js": 2909, "browser/base/content/test/general/browser_getshortcutoruri.js": 3083, "browser/base/content/test/general/browser_identity_UI.js": 20930, "browser/base/content/test/general/browser_insecureLoginForms.js": 4482, diff --git a/testing/runtimes/mochitest-browser-chrome.runtimes.json b/testing/runtimes/mochitest-browser-chrome.runtimes.json index 73b2437a2..73efc2b26 100644 --- a/testing/runtimes/mochitest-browser-chrome.runtimes.json +++ b/testing/runtimes/mochitest-browser-chrome.runtimes.json @@ -82,7 +82,6 @@ "browser/base/content/test/general/browser_fullscreen-window-open.js": 2830, "browser/base/content/test/general/browser_fxa_oauth.js": 4120, "browser/base/content/test/general/browser_fxa_web_channel.js": 3535, - "browser/base/content/test/general/browser_fxaccounts.js": 3175, "browser/base/content/test/general/browser_getshortcutoruri.js": 3344, "browser/base/content/test/general/browser_identity_UI.js": 19308, "browser/base/content/test/general/browser_insecureLoginForms.js": 3538, |