From 26860098e8716628f15422af268c5186c76c1b1b Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Thu, 6 Nov 2014 09:49:25 -0600
Subject: Fix up libaosprecovery

Change-Id: I5a6d0c3c5f9a3a474464c0f06d6b09045459eebb
---
 verifier.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'verifier.cpp')

diff --git a/verifier.cpp b/verifier.cpp
index b96ba3a0d..764b935b3 100644
--- a/verifier.cpp
+++ b/verifier.cpp
@@ -456,10 +456,6 @@ load_keys(const char* filename, int* numKeys) {
                 LOGE("unexpected character between keys\n");
                 goto exit;
             }
-<<<<<<< HEAD
-            LOGI("read key e=%d hash=%d\n", key->exponent, cert->hash_len);
-=======
->>>>>>> cddb68b5eafbeba696d5276bda1f1a9f70bbde42
         }
     }
 
-- 
cgit v1.2.3