From 857c29f7b334125178a4e3003f943c27237663e0 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Thu, 20 Oct 2016 10:49:53 -0700
Subject: [PATCH] fix merge

---
 grpc-build-system.bzl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/grpc-build-system.bzl b/grpc-build-system.bzl
index 0ef3a0ea07d..187cc3e424d 100644
--- a/grpc-build-system.bzl
+++ b/grpc-build-system.bzl
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Copyright 2016, Google Inc.
 # All rights reserved.
 #