chrome/browser/resources/options2/options.html - Issue 9570033: fix merge conflict between r124495 and r124470

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/browser/resources/options2/options.html

Issue 9570033: fix merge conflict between r124495 and r124470 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 10 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/browser/resources/options2/options.html

diff --git a/chrome/browser/resources/options2/options.html b/chrome/browser/resources/options2/options.html

index 437983a39feebdcdc3e36de3582a94b6c789cc20..089a4de60a5328fdff746226020285783ddf26c2 100644

--- a/chrome/browser/resources/options2/options.html

+++ b/chrome/browser/resources/options2/options.html

@@ -151,11 +151,6 @@

<div id="subpage-sheet-container-1"

class="subpage-sheet-container transparent" hidden>

- <div id="subpage-sheet-1" class="subpage-sheet">

- <div class="subpage-sheet-contents">

- <include src="advanced_options.html">

- </div>

</div>

« no previous file with comments | « no previous file | no next file » | no next file with comments »