From a50b062a639b74bb862d5b6995568a75675ef6aa Mon Sep 17 00:00:00 2001 From: niklasad1 Date: Wed, 2 Jan 2019 14:02:10 +0100 Subject: [PATCH] fix(bad merge + spelling) --- parity-clib/Cargo.toml | 2 +- parity-clib/src/java.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parity-clib/Cargo.toml b/parity-clib/Cargo.toml index 4072494e4a6..b3635c6e08f 100644 --- a/parity-clib/Cargo.toml +++ b/parity-clib/Cargo.toml @@ -12,7 +12,7 @@ crate-type = ["cdylib", "staticlib"] [dependencies] futures = "0.1.6" jni = { version = "0.10.1", optional = true } -panic_hook = { path = "../util/panic_hook" } +panic_hook = { path = "../util/panic-hook" } parity-ethereum = { path = "../", default-features = false } tokio = "0.1.11" tokio-current-thread = "0.1.3" diff --git a/parity-clib/src/java.rs b/parity-clib/src/java.rs index 89b3e98f286..30e63e60162 100644 --- a/parity-clib/src/java.rs +++ b/parity-clib/src/java.rs @@ -170,7 +170,7 @@ pub unsafe extern "system" fn Java_io_parity_ethereum_Parity_subscribeWebSocketN .name("ws-subscriber".into()) .spawn(move || { // Wait for subscription ID - // Note this may block forever and be can't destroyed using the session object + // Note this may block forever and can't be destroyed using the session object // However, this will likely timeout or be catched the RPC layer if let Ok(Some(response)) = query_future.wait() { callback.call(&response);