]> Cypherpunks repositories - gostls13.git/commit
projects / gostls13.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: db93edf) | patch
go1.tmpl: fix merge
authorAdam Langley <agl@golang.org>
Tue, 14 Feb 2012 12:13:57 +0000 (07:13 -0500)
committerAdam Langley <agl@golang.org>
Tue, 14 Feb 2012 12:13:57 +0000 (07:13 -0500)
commitc2e58dc568093cb0d8967d62e7081aa2781de89f
treed44f19ae8c05601b3a88ef2782bcfe9b83e9f3c6tree
parentdb93edfc286e05b6f1a1a8e0973a1dfa1ba8046dcommit | diff
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
doc/go1.html diff | blob | history
doc/go1.tmpl diff | blob | history
Go GOST TLS 1.3