From 9b1fa20656386151f88fd589efa92f6c6130672d Mon Sep 17 00:00:00 2001 From: Keverne Louison <39338001+Keverne@users.noreply.github.com> Date: Fri, 7 Aug 2020 09:58:18 +0100 Subject: [PATCH] Resolves conflicts in `sum.rs` --- amadeus-core/src/par_sink/sum.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/amadeus-core/src/par_sink/sum.rs b/amadeus-core/src/par_sink/sum.rs index b13659f5..0793a5ef 100644 --- a/amadeus-core/src/par_sink/sum.rs +++ b/amadeus-core/src/par_sink/sum.rs @@ -57,6 +57,7 @@ where #[inline(always)] fn done(&mut self, state: Self::State) -> Self::Done { state + } }