AB2-722-1 Preferences conflicts

mozilla-release/mobile/android/app/mobile.js

@@ -919,7 +919,6 @@ pref("dom.keyboardevent.dispatch_during_composition", true);
 // Ask for permission when enumerating WebRTC devices.
 pref("media.navigator.permission.device", true);
 
-<<<<<<< .merge_file_b244ng
 /* Cliqz start */
 // Do not allow system add-on updates
 pref("extensions.systemAddon.update.url", "");
@@ -934,15 +933,8 @@ pref("media.autoplay.enabled", false);
 // Prevent mozaddonmanager on AMO
 pref("privacy.resistFingerprinting.block_mozAddonManager", true); 
 /* Cliqz end */
-||||||| .merge_file_VxxVdg
-// Allow system add-on updates
-pref("extensions.systemAddon.update.url", "https://aus5.mozilla.org/update/3/SystemAddons/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
-=======
-// Allow system add-on updates
-pref("extensions.systemAddon.update.url", "https://aus5.mozilla.org/update/3/SystemAddons/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
 
 // E10s stuff. We don't support 'file' or 'priveleged' process types.
 pref("browser.tabs.remote.separateFileUriProcess", false);
 pref("browser.tabs.remote.allowLinkedWebInFileUriProcess", true);
 pref("browser.tabs.remote.separatePrivilegedContentProcess", false);
->>>>>>> .merge_file_QX3tmg

mozilla-release/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java

@@ -956,29 +956,6 @@ public boolean onPreferenceClick(Preference preference) {
                         pref.setEnabled(isHealthReportEnabled);
 
                         // Instruct the user on how to enable Health Report
-<<<<<<< .merge_file_Z3wDhh
-                        final String RIGHT_CHEVRON_SPACE_PADDED = " > ";
-                        final StringBuilder healthReportSettingPath = new StringBuilder()
-                                .append(getString(R.string.pref_category_privacy_short))
-                                .append(RIGHT_CHEVRON_SPACE_PADDED)
-                                .append(getString(R.string.pref_category_datareporting))
-                                .append(RIGHT_CHEVRON_SPACE_PADDED)
-                                .append(getString(R.string.datareporting_fhr_title));
-                        final SpannableString boldSettingsLocation = new SpannableString(healthReportSettingPath);
-                        boldSettingsLocation.setSpan(new StyleSpan(Typeface.BOLD),
-                                0, healthReportSettingPath.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
-||||||| .merge_file_vfcB3g
-                        final String RIGHT_CHEVRON_SPACE_PADDED = " > ";
-                        StringBuilder healthReportSettingPath = new StringBuilder()
-                                .append(getString(R.string.pref_category_privacy_short))
-                                .append(RIGHT_CHEVRON_SPACE_PADDED)
-                                .append(getString(R.string.pref_category_datareporting))
-                                .append(RIGHT_CHEVRON_SPACE_PADDED)
-                                .append(getString(R.string.datareporting_fhr_title));
-                        SpannableString boldSettingsLocation = new SpannableString(healthReportSettingPath);
-                        boldSettingsLocation.setSpan(new StyleSpan(Typeface.BOLD),
-                                0, healthReportSettingPath.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
-=======
                         final String healthReportSettingPath =
                                 getString(R.string.pref_feature_tips_notification_enabling_path);
                         final String enableHealthReportHint =
@@ -997,18 +974,9 @@ public boolean onPreferenceClick(Preference preference) {
                         enableHealthReportBoldedHint.setSpan(new StyleSpan(Typeface.BOLD),
                                 healthReportPathFirstCharIndex, healthReportPathLastCharIndex,
                                 Spannable.SPAN_INCLUSIVE_INCLUSIVE);
->>>>>>> .merge_file_0DcP9g
 
-<<<<<<< .merge_file_Z3wDhh
-                        final SpannableStringBuilder summaryTextBuilder = new SpannableStringBuilder()
-                                .append(getString(R.string.pref_feature_tips_notification_summary))
-||||||| .merge_file_vfcB3g
-                        SpannableStringBuilder summaryTextBuilder = new SpannableStringBuilder()
-                                .append(getString(R.string.pref_feature_tips_notification_summary))
-=======
                         SpannableStringBuilder summaryTextBuilder = new SpannableStringBuilder()
                                 .append(enableHealthReportBoldedHint)
->>>>>>> .merge_file_0DcP9g
                                 .append("\n\n")
                                 .append(getString(R.string.pref_feature_tips_notification_summary));