| commit | 857c29f7b334125178a4e3003f943c27237663e0 | [log] [tgz] |
|---|---|---|
| author | Craig Tiller <ctiller@google.com> | Thu Oct 20 10:49:53 2016 -0700 |
| committer | Craig Tiller <ctiller@google.com> | Thu Oct 20 10:49:53 2016 -0700 |
| tree | 8af6d02ea7555c72baa39ebcca5d2de6c55b2712 | |
| parent | ed5215dc87067b741167b0a4f29c6feeafd5857c [diff] |
fix merge
diff --git a/grpc-build-system.bzl b/grpc-build-system.bzl index 0ef3a0e..187cc3e 100644 --- a/grpc-build-system.bzl +++ b/grpc-build-system.bzl
@@ -1,4 +1,3 @@ -<<<<<<< HEAD # Copyright 2016, Google Inc. # All rights reserved. #