summaryrefslogtreecommitdiffstats
path: root/application/basilisk/installer/allowed-dupes.mn
diff options
context:
space:
mode:
authorAscrod <32915892+Ascrod@users.noreply.github.com>2019-04-18 20:35:10 -0400
committerAscrod <32915892+Ascrod@users.noreply.github.com>2019-04-18 20:35:10 -0400
commitaf7e140d4ed8f5bc9a69da2f0338ad3cb1319dec (patch)
tree4aac6c4383fb9e279fccb13c65a4e44595fd4cf6 /application/basilisk/installer/allowed-dupes.mn
parent40fc72376411587e7bf9985fb9545eca1c9aaa8e (diff)
parent51722cd4fecb5c8c79a302f2771cad71535df5ea (diff)
downloadUXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.tar
UXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.tar.gz
UXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.tar.lz
UXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.tar.xz
UXP-af7e140d4ed8f5bc9a69da2f0338ad3cb1319dec.zip
Merge branch 'master' into default-pref
Diffstat (limited to 'application/basilisk/installer/allowed-dupes.mn')
-rw-r--r--application/basilisk/installer/allowed-dupes.mn2
1 files changed, 0 insertions, 2 deletions
diff --git a/application/basilisk/installer/allowed-dupes.mn b/application/basilisk/installer/allowed-dupes.mn
index 7baa6ebed..a3780bf5a 100644
--- a/application/basilisk/installer/allowed-dupes.mn
+++ b/application/basilisk/installer/allowed-dupes.mn
@@ -211,13 +211,11 @@ chrome/toolkit/skin/classic/mozapps/update/buttons.png
chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png
-components/FxAccountsPush.js
crashreporter.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
crashreporter.app/Contents/Resources/English.lproj/MainMenuRTL.nib/classes.nib
# firefox/firefox-bin is bug 658850
@MOZ_APP_NAME@
@MOZ_APP_NAME@-bin
-modules/FxAccountsPush.js
modules/commonjs/index.js
modules/commonjs/sdk/ui/button/view/events.js
modules/commonjs/sdk/ui/state/events.js