1 files changed, 0 insertions, 4 deletions
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
         }
     }