diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-03-09 15:09:34 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-03-09 15:09:34 -0800 |
| commit | af1158126075c007a0e2fcdf99609545685f62e6 (patch) | |
| tree | 1e50761cd5a2414789cb51dc048c6fbd44c91682 /WORKSPACE | |
| parent | 4d92a49fc0a96afc7f4539c0e600f06b6e4089f6 (diff) | |
| parent | eb064ec7b81b60c5e1eb47d6124d0c05056b3097 (diff) | |
Merge github.com:grpc/grpc into cpp_bazelness
Diffstat (limited to 'WORKSPACE')
| -rw-r--r-- | WORKSPACE | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -34,13 +34,13 @@ bind( ) bind( -<<<<<<< HEAD name = "benchmark", actual = "@submodule_benchmark//:benchmark", -======= +) + +bind( name = "gflags", actual = "@com_github_gflags_gflags//:gflags", ->>>>>>> f2cf3d94a1a46db2ebb2c13c3476e58ecdae6006 ) new_local_repository( |