fix(bad merge + spelling)

openethereum · Jan 2, 2019 · a50b062 · a50b062
1 parent 6014461
commit a50b062
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);