chrome/app/generated_resources.grd - Issue 1001043004: Revamp desktop Autofill settings, round 2

Keyboard Shortcuts

	File
u :	up to issue
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

	Issue
u :	up to list of issues
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

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.

Issue 1001043004: Revamp desktop Autofill settings, round 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/app/generated_resources.grd

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd

index 647a3c8e117e633b664994d18e24c6121463e7e3..280da47685af58504ce801fb0ef2b7605e54e0e0 100644

--- a/chrome/app/generated_resources.grd

+++ b/chrome/app/generated_resources.grd

@@ -10503,6 +10503,12 @@ Chrome ran out of memory.

Edit...

</message>

+<<<<<<< HEAD

please use gerrit instead 2015/03/13 18:25:51 Please fix.

+ <message name="IDS_AUTOFILL_FROM_GOOGLE_PAYMENTS" desc="Text that indicates an address or credit card came from Google Payments.">

+ Google Payments

+ </message>

+=======

+>>>>>>> ea64fb20a0c9480046264075d056428d9ab3918c

Clear copy

</message>

« no previous file with comments | « build/ios/grit_whitelist.txt ('k') | chrome/browser/resources/options/autofill_options.css » ('j') | no next file with comments »