tracing/tracing/ui/base/table.html - Issue 2164413002: [Polymer10 rebase] Fix table.html change markers

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: tracing/tracing/ui/base/table.html

Issue 2164413002: [Polymer10 rebase] Fix table.html change markers (Closed) Base URL: git@github.com:catapult-project/catapult.git@polymer10-rebase

Patch Set: Created 4 years, 5 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:

View side-by-side diff with in-line comments

Download patch

Index: tracing/tracing/ui/base/table.html

diff --git a/tracing/tracing/ui/base/table.html b/tracing/tracing/ui/base/table.html

index 0de3fbd2e731891843e3bbcf4a874cd86c92c8b4..0a52a8f8ba507b1cc663caf94ce828e6f40a6290 100644

--- a/tracing/tracing/ui/base/table.html

+++ b/tracing/tracing/ui/base/table.html

@@ -1498,17 +1498,8 @@ tr.exportTo('tr.ui.b', function() {

#side {

-webkit-user-select: none;

flex: 0 0 auto;

-<<<<<<< HEAD

padding-left: 2px;

padding-right: 2px;

-=======

- padding-left: 4px;

->>>>>>> 8881d68... Merge origin/master to the polymer branch.

-=======

- padding-left: 2px;

- padding-right: 2px;

->>>>>>> d779e0a... [polymer] Merge of master into polymer10-migration

vertical-align: top;

font-size: 15px;

font-family: sans-serif;

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