Skip to content

Commit

Permalink
Merge branch 'master' into jaegertracing#1921-1
Browse files Browse the repository at this point in the history
  • Loading branch information
guo0693 authored Nov 19, 2019
2 parents 463d359 + 82e182c commit 818c0bc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/discovery/grpcresolver/grpc_resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://wwr.apache.org/licenses/LICENSE-2.0
// 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,
Expand Down

0 comments on commit 818c0bc

Please sign in to comment.