From: Matt Corallo <git@bluematt.me>
Date: Fri, 15 Nov 2019 22:19:26 +0000 (-0500)
Subject: Fix build broken by silent merge conflicts
X-Git-Tag: v0.0.12~180^2~1
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=2118feb090c279be7a1eac4f7104dd619a6f379e;p=rust-lightning

Fix build broken by silent merge conflicts
---

diff --git a/src/ln/channelmanager.rs b/src/ln/channelmanager.rs
index a0e066371..fad5b30b3 100644
--- a/src/ln/channelmanager.rs
+++ b/src/ln/channelmanager.rs
@@ -1393,14 +1393,16 @@ impl ChannelManager {
 									match handle_error!(self, err) {
 										Ok(_) => unreachable!(),
 										Err(e) => {
-											if let Some(msgs::ErrorAction::IgnoreError) = e.action {
-											} else {
-												log_error!(self, "Got bad keys: {}!", e.err);
-												let mut channel_state = self.channel_state.lock().unwrap();
-												channel_state.pending_msg_events.push(events::MessageSendEvent::HandleError {
-													node_id: their_node_id,
-													action: e.action,
-												});
+											match e.action {
+												msgs::ErrorAction::IgnoreError => {},
+												_ => {
+													log_error!(self, "Got bad keys: {}!", e.err);
+													let mut channel_state = self.channel_state.lock().unwrap();
+													channel_state.pending_msg_events.push(events::MessageSendEvent::HandleError {
+														node_id: their_node_id,
+														action: e.action,
+													});
+												},
 											}
 											continue;
 										},