mobile/android/base/resources/xml-v11/preference_headers.xml - Issue 29330952: Issue 3127 - Merge conflicts, base 42.0.1

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: mobile/android/base/resources/xml-v11/preference_headers.xml

Issue 29330952: Issue 3127 - Merge conflicts, base 42.0.1 (Closed)

Patch Set: Created Nov. 26, 2015, 11:01 a.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: mobile/android/base/resources/xml-v11/preference_headers.xml

diff --git a/mobile/android/base/resources/xml-v11/preference_headers.xml b/mobile/android/base/resources/xml-v11/preference_headers.xml

index 87f28b07a874c175f7ae4d3375970ca32465736e..8fd2c3f4661ff316fc9fc5eab23f0fc1f30994b1 100644

--- a/mobile/android/base/resources/xml-v11/preference_headers.xml

+++ b/mobile/android/base/resources/xml-v11/preference_headers.xml

@@ -29,6 +29,12 @@

</header>

<header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"

+ android:title="@string/abb_pref_header_adblocking">

+ <extra android:name="resource"

+ android:value="preferences_abb_abp"/>

+ </header>

+ <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"

android:title="@string/pref_header_language"

android:id="@+id/pref_header_language">

<extra android:name="resource"

@@ -41,11 +47,6 @@

android:value="preferences_vendor"/>

</header>

- <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"

- android:title="@string/pref_header_devtools"

- android:id="@+id/pref_header_devtools">

- <extra android:name="resource"

- android:value="preferences_devtools"/>

- </header>

+

</preference-headers>