]> Cypherpunks repositories - gostls13.git/commit
os: fix build.
authorShenghou Ma <minux.ma@gmail.com>
Tue, 10 Dec 2013 04:46:21 +0000 (23:46 -0500)
committerShenghou Ma <minux.ma@gmail.com>
Tue, 10 Dec 2013 04:46:21 +0000 (23:46 -0500)
commita4b66b770386ddb699574b28cd0a86a7c88ecc66
tree846e7b2e8e1610d98c660045f406eeb52768e3f2
parent4f2cfdc7f44f26548be4a84414a8e21985b3e441
os: fix build.
CL 36800043 and CL 36930044 have a merge conflict that I overlooked.

R=golang-dev
CC=golang-dev
https://golang.org/cl/39850043
src/pkg/os/file.go