mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-29 20:07:30 +09:00
Revert "Issue #1053 - Part 1c: Remove references to mobile/android targets and paths"
This reverts commit b21588597c.
This commit is contained in:
parent
05d0c3f046
commit
62e367cb90
80 changed files with 3645 additions and 8 deletions
|
|
@ -1,2 +1,15 @@
|
|||
#include ../../netwerk/base/security-prefs.js
|
||||
#include init/all.js
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
#ifdef MOZ_DATA_REPORTING
|
||||
#include ../../toolkit/components/telemetry/datareporting-prefs.js
|
||||
#endif
|
||||
#ifdef MOZ_SERVICES_HEALTHREPORT
|
||||
#if MOZ_WIDGET_TOOLKIT == android
|
||||
#include ../../mobile/android/chrome/content/healthreport-prefs.js
|
||||
#else
|
||||
#include ../../toolkit/components/telemetry/healthreport-prefs.js
|
||||
#endif
|
||||
#endif
|
||||
>>>>>>> parent of b21588597c (Issue #1053 - Part 1c: Remove references to mobile/android targets and paths)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue