fix merge

8 years ago · 857c29f7b3
parent ed5215dc87
commit 857c29f7b3
1 changed files with 0 additions and 1 deletions
--- a/grpc-build-system.bzl
+++ b/grpc-build-system.bzl
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Copyright 2016, Google Inc.
 # All rights reserved.
 #