Issue 2177643003: Fixed automatic Merge error with vm-nav-menu branch

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

Issue 2177643003: Fixed automatic Merge error with vm-nav-menu branch (Closed)

Created:
4 years, 5 months ago by cbernaschina

Modified:
4 years, 5 months ago

Reviewers:
rmacnak

CC:
reviews_dartlang.org, turnidge, rmacnak, Cutch, vm-dev_dartlang.org

Base URL:
git@github.com:dart-lang/sdk.git@master

Target Ref:
refs/heads/master

Visibility:
Public.

Created: 4 years, 5 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+3 lines, -16 lines)			Patch
	M	runtime/observatory/lib/src/elements/helpers/uris.dart	View		1 chunk	+3 lines, -4 lines	0 comments	Download
	M	runtime/observatory/lib/src/elements/nav_bar.html	View		1 chunk	+0 lines, -12 lines	0 comments	Download

Total messages: 3 (1 generated)

cbernaschina

Committed patchset #1 (id:1) manually as b730ee71614bfde71745d287049f8bb8e2f8a69d (presubmit successful).

4 years, 5 months ago (2016-07-22 23:30:36 UTC) #2

Message was sent while issue was closed.

lgtm