diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2014-11-06 16:49:25 +0100 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2014-11-06 16:49:25 +0100 |
| commit | 26860098e8716628f15422af268c5186c76c1b1b (patch) | |
| tree | e21e8b799369e535f4a112783919aae079b3a35b /verifier.cpp | |
| parent | Fix some includes that are not longer present (diff) | |
| download | android_bootable_recovery-26860098e8716628f15422af268c5186c76c1b1b.tar android_bootable_recovery-26860098e8716628f15422af268c5186c76c1b1b.tar.gz android_bootable_recovery-26860098e8716628f15422af268c5186c76c1b1b.tar.bz2 android_bootable_recovery-26860098e8716628f15422af268c5186c76c1b1b.tar.lz android_bootable_recovery-26860098e8716628f15422af268c5186c76c1b1b.tar.xz android_bootable_recovery-26860098e8716628f15422af268c5186c76c1b1b.tar.zst android_bootable_recovery-26860098e8716628f15422af268c5186c76c1b1b.zip | |
Diffstat (limited to 'verifier.cpp')
| -rw-r--r-- | verifier.cpp | 4 |
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 } } |