9397: Remove conflicting code for easier merge
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 9 Feb 2017 19:11:35 +0000 (14:11 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 9 Feb 2017 19:11:35 +0000 (14:11 -0500)
commit310f7b0266f012355e38f3296bc6defe14a3d25f
tree050fc54c4e1da56cf9599ca6d045de56d78a2aa2
parentef934e66fee76dcf760dd5fc835f27127e4cc791
9397: Remove conflicting code for easier merge
sdk/go/manifest/manifest.go
sdk/go/manifest/manifest_test.go