From d8c66d5b565c97081c054d24e5cdc9484424b4fb Mon Sep 17 00:00:00 2001 From: Roy Tam Date: Sat, 30 Nov 2019 21:02:50 +0800 Subject: [PATCH] fix master branch build --- .gitattributes | 1 + dom/html/test/mochitest.ini | 8 ++++---- toolkit/mozapps/webextensions/moz.build | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..b4e1a25832 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +dom/html/test/mochitest.ini eol=crlf diff --git a/dom/html/test/mochitest.ini b/dom/html/test/mochitest.ini index 1059bc5d0f..b9da7def8e 100644 --- a/dom/html/test/mochitest.ini +++ b/dom/html/test/mochitest.ini @@ -605,7 +605,7 @@ skip-if = os == "android" # up/down arrow keys not supported on android [test_bug1295719_event_sequence_for_number_keys.html] [test_bug1310865.html] [test_bug1315146.html] -+[test_script_module.html] -+support-files = -+ file_script_module.html -+ file_script_nomodule.html \ No newline at end of file +[test_script_module.html] +support-files = + file_script_module.html + file_script_nomodule.html \ No newline at end of file diff --git a/toolkit/mozapps/webextensions/moz.build b/toolkit/mozapps/webextensions/moz.build index f6e83a355b..3898521eb9 100644 --- a/toolkit/mozapps/webextensions/moz.build +++ b/toolkit/mozapps/webextensions/moz.build @@ -32,8 +32,8 @@ EXTRA_JS_MODULES += [ '../extensions/DeferredSave.jsm', '../extensions/GMPUtils.jsm', 'AddonManager.jsm', - 'LightweightThemeManager.jsm', 'GMPInstallManager.jsm', + 'LightweightThemeManager.jsm', ] JAR_MANIFESTS += ['jar.mn']