From f51b7e16ee96cbcd23a85aef982ca7a4bada2727 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Mon, 13 Nov 2017 21:05:32 -0800 Subject: Fix missing copyright, fix merge conflict in updated BUILD --- test/core/handshake/server_ssl_common.h | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'test/core/handshake/server_ssl_common.h') diff --git a/test/core/handshake/server_ssl_common.h b/test/core/handshake/server_ssl_common.h index 94ac588f0e..77865a408f 100644 --- a/test/core/handshake/server_ssl_common.h +++ b/test/core/handshake/server_ssl_common.h @@ -1,6 +1,20 @@ -// -// Created by apolcyn on 10/31/17. -// +/* + * + * Copyright 2016 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ #ifndef GRPC_SERVER_SSL_COMMON_H #define GRPC_SERVER_SSL_COMMON_H -- cgit v1.2.3