travis pls

2020-03-30 13:37:22 -06:00 · 2020-03-30 13:37:22 -06:00 · 2cd6460260
commit 2cd6460260
parent 9e643acb3d
1 changed files with 0 additions and 4 deletions
--- a/test/PostgreSQL/Test.hs
+++ b/test/PostgreSQL/Test.hs
@ -489,11 +489,7 @@ testAggregateFunctions = do

 testPostgresModule :: Spec
 testPostgresModule = do
-<<<<<<< HEAD
  describe "date_trunc" $ modifyMaxSuccess (`div` 10) $ do
-=======
-  describe "date_trunc" $ do
->>>>>>> master
    prop "works" $ \listOfDateParts -> run $ do
      let
        utcTimes =