diff options
| author |  yang-g <yangg@google.com> | 2015-07-06 14:05:54 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-07-06 14:05:54 -0700 |
| commit | 5ea46ab2482c3724fbc7fd0aab55f324fb65999c (patch) | |
| tree | 55eebc4aae8f06f931c8f75ddf84d56595f99fa1 /src/cpp/server/server_credentials.cc | |
| parent | 3abe60b9d08ff5a784a39f7c4a10c631547c3526 (diff) | |
| parent | d426864934ac60f46e538ba81932e405fa8949b1 (diff) | |
merge with upstream and resolve conflicts
Diffstat (limited to 'src/cpp/server/server_credentials.cc')
| -rw-r--r-- | src/cpp/server/server_credentials.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/cpp/server/server_credentials.cc b/src/cpp/server/server_credentials.cc index 6bdb465baa..be3a7425e0 100644 --- a/src/cpp/server/server_credentials.cc +++ b/src/cpp/server/server_credentials.cc @@ -31,8 +31,6 @@ * */ -#include <grpc/grpc_security.h> - #include <grpc++/server_credentials.h> namespace grpc { |