diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-17 08:51:49 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-17 08:51:49 +0200 |
| commit | 882aaf5b1fda7b216051b55e268de78fd5126f42 (patch) | |
| tree | ccb3f6f6299a5d1c603e6b73d3892f635bb96a8e /services/sync/moz.build | |
| parent | 8ee235ca5df26f39ca3066935bef90c4d28dd61a (diff) | |
| parent | d118d486a680ed42030b1bdee263a29831da3e86 (diff) | |
| download | UXP-882aaf5b1fda7b216051b55e268de78fd5126f42.tar UXP-882aaf5b1fda7b216051b55e268de78fd5126f42.tar.gz UXP-882aaf5b1fda7b216051b55e268de78fd5126f42.tar.lz UXP-882aaf5b1fda7b216051b55e268de78fd5126f42.tar.xz UXP-882aaf5b1fda7b216051b55e268de78fd5126f42.zip | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/config/version.txt
# js/src/jit/x86-shared/AssemblerBuffer-x86-shared.h
# toolkit/components/search/orginal/nsSearchService.js
Diffstat (limited to 'services/sync/moz.build')
| -rw-r--r-- | services/sync/moz.build | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/services/sync/moz.build b/services/sync/moz.build index 83c39274a..5e5de10b7 100644 --- a/services/sync/moz.build +++ b/services/sync/moz.build @@ -26,7 +26,6 @@ EXTRA_JS_MODULES['services-sync'] += [ 'modules/browserid_identity.js', 'modules/collection_validator.js', 'modules/engines.js', - 'modules/FxaMigrator.jsm', 'modules/identity.js', 'modules/jpakeclient.js', 'modules/keys.js', |