From 8a45a1883cb0eba7278b3cb5589c4e43797511f2 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Mon, 18 May 2020 15:46:39 -0400
Subject: [PATCH] merge conflict: remove merge conflict message

Change-Id: Ife2ff7082494f9cc933a9f22e596ca0716c2ced6
---
 installcommand.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/installcommand.cpp b/installcommand.cpp
index d6e95c8d..2a67e826 100644
--- a/installcommand.cpp
+++ b/installcommand.cpp
@@ -1,5 +1,3 @@
-<<<<<<< HEAD   (fc79aa Encryption: don't try wrapped key if not needed)
-=======
 /*
  * Copyright (C) 2007 The Android Open Source Project
  *