storage/app: fix merge error in upload.go

Change-Id: I6220ec86c80c07899b1e511753a07da54e5e7bbd
Reviewed-on: https://go-review.googlesource.com/35153
Reviewed-by: Russ Cox <rsc@golang.org>
1 file changed
tree: 7d5f59ad9ddf3e0266a309c1e2e1e20e3c22ae24
  1. cmd/
  2. storage/
  3. AUTHORS
  4. CONTRIBUTING.md
  5. CONTRIBUTORS
  6. LICENSE
  7. PATENTS
  8. README