go1.tmpl: fix merge

hg massively messed up a simple merge for 9d7addec2635 in what I can only imagine was a public service announcement that everyone should use git. R=golang-dev CC=golang-dev https://golang.org/cl/5668043

go1.tmpl: fix merge
hg massively messed up a simple merge for 9d7addec2635 in what I can only imagine was a public service announcement that everyone should use git. R=golang-dev CC=golang-dev https://golang.org/cl/5668043
c2e58dc5 · Adam Langley · db93edfc · c2e58dc5 · c2e58dc5
Commit c2e58dc5 authored Feb 14, 2012 by Adam Langley
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 346 additions and 100 deletions

doc/go1.html doc/go1.html +173 -50

doc/go1.tmpl doc/go1.tmpl +173 -50

No files found.
--- a/doc/go1.html
+++ b/doc/go1.html
--- a/doc/go1.tmpl
+++ b/doc/go1.tmpl