merge conflict: remove merge conflict message

Change-Id: Ife2ff7082494f9cc933a9f22e596ca0716c2ced6
2020-05-18 15:46:39 -04:00
parent 72bcc2030c
commit 8a45a1883c
1 changed files with 0 additions and 2 deletions
--- 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
 *