diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-04-16 06:59:00 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-04-16 06:59:00 -0400 |
| commit | dea59474457c7c62009aa11e41f3a56e9f30f62a (patch) | |
| tree | b1604728b6048b2964517a7a36144c712990480a /modules | |
| parent | 0ea4dabdeaa5e3f198bece363fa45c032b9f3cb7 (diff) | |
| parent | 095ea556855b38138e39e713f482eb440f7da9b2 (diff) | |
| download | UXP-dea59474457c7c62009aa11e41f3a56e9f30f62a.tar UXP-dea59474457c7c62009aa11e41f3a56e9f30f62a.tar.gz UXP-dea59474457c7c62009aa11e41f3a56e9f30f62a.tar.lz UXP-dea59474457c7c62009aa11e41f3a56e9f30f62a.tar.xz UXP-dea59474457c7c62009aa11e41f3a56e9f30f62a.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/libpref/Preferences.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp index c56cad98d..19487704f 100644 --- a/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp @@ -1306,8 +1306,6 @@ static nsresult pref_InitInitialObjects() "winpref.js" #elif defined(XP_UNIX) "unix.js" -#elif defined(XP_BEOS) - "beos.js" #endif }; |