| commit | dbe98deec038172805caf51c5388d54c02e120dd | [log] [tgz] |
|---|---|---|
| author | Shenghou Ma <minux.ma@gmail.com> | Wed Nov 21 22:17:09 2012 +0800 |
| committer | Shenghou Ma <minux.ma@gmail.com> | Wed Nov 21 22:17:09 2012 +0800 |
| tree | 911fb20dc433de289ce5fb6f9c7079a7da0c68d1 | |
| parent | 541223c9f5a4a56048fe70c9ed2bb5aa2aadece2 [diff] |
go.talks/pkg/present: resolve merging conflict Fixes golang/go#4416. R=golang-dev, iant CC=golang-dev https://golang.org/cl/6847081