oops

pyca · Jan 31, 2025 · 2d65a27 · 2d65a27
1 parent 60bf8ed
commit 2d65a27
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/rust/cryptography-key-parsing/src/ec.rs b/src/rust/cryptography-key-parsing/src/ec.rs
@@ -105,4 +105,3 @@ pub fn parse_pkcs1_private_key(
         .map_err(|_| KeyParsingError::InvalidKey)?;
     Ok(openssl::pkey::PKey::from_ec_key(ec_key)?)
 }
->>>>>>> 1a8c3d5ef (Migrate parsing of unencrypted PKCS#8 private keys to Rust)