From 058fff2f6cd4c803125dd51c0cc6150b0c67d159 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Fri, 8 Jan 2016 12:50:36 -0800
Subject: [PATCH] Merge another file

---
 src/core/security/security_connector.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/core/security/security_connector.c b/src/core/security/security_connector.c
index f25d9aab3f..c7b6aa16c4 100644
--- a/src/core/security/security_connector.c
+++ b/src/core/security/security_connector.c
@@ -316,12 +316,7 @@ grpc_channel_security_connector *grpc_fake_channel_security_connector_create(
   c->base.is_client_side = 1;
   c->base.url_scheme = GRPC_FAKE_SECURITY_URL_SCHEME;
   c->base.vtable = &fake_channel_vtable;
-<<<<<<< HEAD
-  c->request_metadata_creds =
-      grpc_call_credentials_ref(request_metadata_creds);
-=======
   c->request_metadata_creds = grpc_call_credentials_ref(request_metadata_creds);
->>>>>>> master
   c->check_call_host = fake_channel_check_call_host;
   return c;
 }
-- 
GitLab