From fd73fe985329b36bbb1e0070d67da639c12b187c Mon Sep 17 00:00:00 2001
From: Alistair Strachan <astrachan@google.com>
Date: Mon, 22 Oct 2018 19:15:22 -0700
Subject: [PATCH] Build fix for 076c36fce1ea0.

Bug: 116008047
Change-Id: I053866f49e1ec090fde9a6fbf19a34c5e4e6e8e3
Signed-off-by: Alistair Strachan <astrachan@google.com>
---
 fs/crypto/keyinfo.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c
index b13e968273a4..3cbe0eff8767 100644
--- a/fs/crypto/keyinfo.c
+++ b/fs/crypto/keyinfo.c
@@ -153,7 +153,6 @@ static struct fscrypt_mode {
 	int keysize;
 	bool logged_impl_name;
 } available_modes[] = {
-<<<<<<< HEAD
 	[FS_ENCRYPTION_MODE_AES_256_XTS] = {
 		.friendly_name = "AES-256-XTS",
 		.cipher_str = "xts(aes)",