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

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

webfd/go-zh.talks,bryanxu/go-zh.talks,d0f/go-zh.talks,webfd/go-zh.talks,d0f/go-zh.talks,d0f/go-zh.talks,bryanxu/go-zh.talks,webfd/go-zh.talks,webfd/go-zh.talks,bryanxu/go-zh.talks,bryanxu/go-zh.talks,webfd/go-zh.talks,bryanxu/go-zh.talks,webfd/go-zh.talks,bryanxu/go-zh.talks,d0f/go-zh.talks,d0f/go-zh.talks,d0f/go-zh.talks