| commit | 9d1f0c4a0c31e18e21770cfaf5a29ed1db94da89 | [log] [tgz] |
|---|---|---|
| author | yang-g <yangg@google.com> | Mon Aug 24 16:08:36 2015 -0700 |
| committer | yang-g <yangg@google.com> | Mon Aug 24 16:08:36 2015 -0700 |
| tree | 9b27baca2b5df75ba78a04b394d14817fca4f68e | |
| parent | 3db9d017292fd8bb6be99267b82b534a42aaa1c6 [diff] [blame] |
Fix merge failures
diff --git a/BUILD b/BUILD index f721061..257f12f 100644 --- a/BUILD +++ b/BUILD
@@ -854,8 +854,8 @@ cc_library( name = "grpc_plugin_support", srcs = [ - "include/grpc++/config.h", - "include/grpc++/config_protobuf.h", + "include/grpc++/support/config.h", + "include/grpc++/support/config_protobuf.h", "src/compiler/config.h", "src/compiler/cpp_generator.h", "src/compiler/cpp_generator_helpers.h",