From bec1ae4a3b23ac64849010170e3c94eabf1d9fee Mon Sep 17 00:00:00 2001 From: Bram Date: Tue, 28 May 2024 18:29:26 +0200 Subject: [PATCH] Fix merge conflict bug --- tests/Test/Values/Context.elm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/Test/Values/Context.elm b/tests/Test/Values/Context.elm index 6575512..47b142d 100644 --- a/tests/Test/Values/Context.elm +++ b/tests/Test/Values/Context.elm @@ -19,15 +19,18 @@ fuzzer = maybeString = Fuzz.maybe Fuzz.string in - Fuzz.map8 (\a b c d e f ( g, h ) ( i, j ) -> Context a b c d e f g h i j) + Fuzz.map8 (\a b c d e ( f, g ) ( h, i ) ( j, k ) -> Context a b c d e f g h i j k) (Fuzz.constant <| Hashdict.empty .value) maybeString maybeString (Fuzz.maybe TestTimestamp.fuzzer) maybeString - maybeString (Fuzz.pair + maybeString Fuzz.string + ) + (Fuzz.pair + maybeString maybeString ) (Fuzz.pair