From b018028ee9f733d5c6907e4ef362794e75b8c38c Mon Sep 17 00:00:00 2001
From: "Joseph C. Sible" <josephcsible@users.noreply.github.com>
Date: Wed, 5 Feb 2020 01:38:49 -0500
Subject: [PATCH] Remove our bool function (#6116)

Data.Bool already provides a bool function identical to this one.
---
 src/Text/Pandoc/Readers/Odt/Generic/Utils.hs        | 9 ---------
 src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs | 1 +
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/Text/Pandoc/Readers/Odt/Generic/Utils.hs b/src/Text/Pandoc/Readers/Odt/Generic/Utils.hs
index ead0d2f9e..5889f2d08 100644
--- a/src/Text/Pandoc/Readers/Odt/Generic/Utils.hs
+++ b/src/Text/Pandoc/Readers/Odt/Generic/Utils.hs
@@ -20,7 +20,6 @@ module Text.Pandoc.Readers.Odt.Generic.Utils
 , uncurry6
 , swap
 , reverseComposition
-, bool
 , tryToRead
 , Lookupable(..)
 , readLookupables
@@ -59,14 +58,6 @@ composition        = F.foldr (<<<) Cat.id
 reverseComposition :: (Category cat, F.Foldable f) => f (cat a a) -> cat a a
 reverseComposition = F.foldr (>>>) Cat.id
 
--- | 'Either' has 'either', 'Maybe' has 'maybe'. 'Bool' should have 'bool'.
--- Note that the first value is selected if the boolean value is 'False'.
--- That makes 'bool' consistent with the other two. Also, 'bool' now takes its
--- arguments in the exact opposite order compared to the normal if construct.
-bool :: a -> a -> Bool -> a
-bool x _ False = x
-bool _ x True  = x
-
 -- | This function often makes it possible to switch values with the functions
 -- that are applied to them.
 --
diff --git a/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs b/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs
index 59d1b8abd..796026843 100644
--- a/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs
+++ b/src/Text/Pandoc/Readers/Odt/Generic/XMLConverter.hs
@@ -60,6 +60,7 @@ import           Control.Applicative  hiding ( liftA, liftA2 )
 import           Control.Monad               ( MonadPlus )
 import           Control.Arrow
 
+import           Data.Bool ( bool )
 import           Data.Either ( rights )
 import qualified Data.Map             as M
 import qualified Data.Text            as T