From 2cd6460260f88996dce283eb745f4e0619f06cc5 Mon Sep 17 00:00:00 2001
From: parsonsmatt <parsonsmatt@gmail.com>
Date: Mon, 30 Mar 2020 13:37:22 -0600
Subject: [PATCH] travis pls

---
 test/PostgreSQL/Test.hs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/PostgreSQL/Test.hs b/test/PostgreSQL/Test.hs
index 7200226..93d2c14 100644
--- 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 =