wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-25 08:37:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Resolve git conflict in goanna.js

Browse source
This commit is contained in:
wuggy 2026-04-08 15:41:01 -07:00
commit efa9662725
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/libpref/goanna.js
View file

@ -1,7 +1,5 @@
#include ../../netwerk/base/security-prefs.js #include ../../netwerk/base/security-prefs.js
#include init/all.js #include init/all.js
<<<<<<< HEAD
=======
#ifdef MOZ_DATA_REPORTING #ifdef MOZ_DATA_REPORTING
#include ../../toolkit/components/telemetry/datareporting-prefs.js #include ../../toolkit/components/telemetry/datareporting-prefs.js
#endif #endif
@ -12,4 +10,3 @@
#include ../../toolkit/components/telemetry/healthreport-prefs.js #include ../../toolkit/components/telemetry/healthreport-prefs.js
#endif #endif
#endif #endif
>>>>>>> parent of b21588597c (Issue #1053 - Part 1c: Remove references to mobile/android targets and paths)