From 1df89950abd0039b4ad54460dacdd0acf86451d4 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Wed, 14 Sep 2016 16:39:33 -0400 Subject: [PATCH] Correct a conflict that got committed. --- src/Term/Arbitrary.hs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Term/Arbitrary.hs b/src/Term/Arbitrary.hs index 86b1a52c1..9d568367c 100644 --- a/src/Term/Arbitrary.hs +++ b/src/Term/Arbitrary.hs @@ -26,13 +26,8 @@ arbitraryTermSize = cata (succ . sum) . toTerm -- Instances -<<<<<<< HEAD -type instance Base (ArbitraryTerm leaf annotation) = CofreeF (Syntax leaf) annotation -instance Corecursive (ArbitraryTerm leaf annotation) where embed = ArbitraryTerm -======= type instance Base (ArbitraryTerm leaf annotation) = TermF (Syntax leaf) annotation instance Unfoldable (ArbitraryTerm leaf annotation) where embed (a :< s) = ArbitraryTerm a s ->>>>>>> master instance (Eq leaf, Eq annotation, Arbitrary leaf, Arbitrary annotation) => Arbitrary (ArbitraryTerm leaf annotation) where arbitrary = sized $ \ n -> do