Raul Jordan 205594c5d6 Fix Travis Failures on Master (#1938) ... * resolve travis conflicts * cp proto * revert * remove unused context		2019-03-07 23:54:41 -05:00
..
BUILD.bazel	Use gogo protobuf as the protoc compiler (#1165)	2018-12-23 15:34:59 -05:00
services.pb.go	Fix Travis Failures on Master (#1938)	2019-03-07 23:54:41 -05:00
services.proto	PendingAttestations: allow for request to specify a slot (#1922)	2019-03-07 09:56:22 -06:00