Issue 55480043: Removing conflict markers.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
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
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
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
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 55480043: Removing conflict markers. (Closed)

Can't Edit
Can't Publish+Mail
Start Review

Created:
10 years, 3 months ago by pajamallama

Modified:
10 years, 3 months ago

Reviewers:
tapted

CC:
chrome-apps-internsyd_google.com

Base URL:
https://github.com/tapted/bleeding_edge.git@master

Visibility:
Public.

Removing conflict markers. TBR=tapted@chromium.org Committed: https://github.com/tapted/bleeding_edge/commit/b1e0a87

Created: 10 years, 3 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+0 lines, -8 lines)			Patch
	M	dart/sdk/lib/_internal/pub/lib/src/wrap/io_wrap.dart	View		1 chunk	+0 lines, -8 lines	0 comments	Download

Total messages: 2

pajamallama

Committed patchset #1 manually as rb1e0a87 (presubmit successful).

10 years, 3 months ago (2014-01-22 03:50:40 UTC) #1

tapted

10 years, 3 months ago (2014-01-22 03:58:14 UTC) #2

Message was sent while issue was closed.

not lgtm :)

I just rolled back origin/master to point to the prior commit