Issue 6847081: code review 6847081: go.talks/pkg/present: resolve merging conflict

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 6847081: code review 6847081: go.talks/pkg/present: resolve merging conflict (Closed)

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

Created:
11 years, 6 months ago by minux1

Modified:
11 years, 6 months ago

Reviewers:

CC:
golang-dev, iant

Visibility:
Public.

Description

go.talks/pkg/present: resolve merging conflict Fixes issue 4416.

Patch Set 1 #

Patch Set 2 : diff -r 232d341de375 https://code.google.com/p/go.talks #

Patch Set 3 : diff -r 232d341de375 https://code.google.com/p/go.talks #

Created: 11 years, 6 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+0 lines, -23 lines)			Patch
	M	pkg/present/doc.go	View	1	1 chunk	+0 lines, -23 lines	0 comments	Download

Messages

Total messages: 3

Expand All Messages | Collapse All Messages

minux1

Hello golang-dev@googlegroups.com (cc: golang-dev@googlegroups.com), I'd like you to review this change to https://code.google.com/p/go.talks

11 years, 6 months ago (2012-11-21 09:13:30 UTC) #1

minux1

11 years, 6 months ago (2012-11-21 14:17:18 UTC) #3

*** Submitted as
http://code.google.com/p/go/source/detail?r=ed46193f747d&repo=talks ***

go.talks/pkg/present: resolve merging conflict
Fixes issue 4416.

R=golang-dev, iant
CC=golang-dev
http://codereview.appspot.com/6847081

Expand All Messages | Collapse All Messages