tracing/tracing/ui/analysis/single_frame_sub_view.html - Issue 2172783002: [polymer] Fix rebase mistakes in tracing/

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/analysis/single_frame_sub_view.html

Issue 2172783002: [polymer] Fix rebase mistakes in tracing/ (Closed) Base URL: git@github.com:catapult-project/catapult.git@polymer10-rebase

Patch Set: Checkpoint. 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:

Index: tracing/tracing/ui/analysis/single_frame_sub_view.html

diff --git a/tracing/tracing/ui/analysis/single_frame_sub_view.html b/tracing/tracing/ui/analysis/single_frame_sub_view.html

index ecbd56032b228b52caa6b76cfc5e8ff1c90fa082..a790a413312775df6a1550809fd6ea64e02e2b93 100644

--- a/tracing/tracing/ui/analysis/single_frame_sub_view.html

+++ b/tracing/tracing/ui/analysis/single_frame_sub_view.html

@@ -52,4 +52,3 @@ Polymer({

}

});

</script>

->>>>>>> e0865ec... Checkpoint.