From 9ca0799435aca9f4380ca7e80358dc77236d1b24 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 18 Oct 2015 00:49:46 +0200
Subject: Merged PrintOut into Main.hs

---
 servant/src/Main.hs     |  6 ++++++
 servant/src/PrintOut.hs | 14 --------------
 2 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 servant/src/PrintOut.hs

(limited to 'servant')

diff --git a/servant/src/Main.hs b/servant/src/Main.hs
index 7def207..e93972f 100644
--- a/servant/src/Main.hs
+++ b/servant/src/Main.hs
@@ -7,6 +7,8 @@
 {-# LANGUAGE QuasiQuotes                #-}
 {-# LANGUAGE TemplateHaskell            #-}
 {-# LANGUAGE TypeFamilies               #-}
+{-# LANGUAGE FlexibleInstances          #-}
+{-# LANGUAGE TypeSynonymInstances       #-}
 
 import Thermoprint
 import Thermoprint.Api
@@ -44,6 +46,10 @@ import Data.Int (Int64)
 
 import Prelude hiding (print)
 
+type PrintOut = Block String
+
+derivePersistFieldJSON "PrintOut"
+
 share [mkPersist sqlSettings, mkMigrate "migrateAll"] [persistLowerCase|
 Draft
   title String
diff --git a/servant/src/PrintOut.hs b/servant/src/PrintOut.hs
deleted file mode 100644
index 5f95a22..0000000
--- a/servant/src/PrintOut.hs
+++ /dev/null
@@ -1,14 +0,0 @@
-{-# LANGUAGE TemplateHaskell      #-}
-{-# LANGUAGE TypeSynonymInstances #-}
-{-# LANGUAGE FlexibleInstances    #-}
-module PrintOut
-       ( PrintOut
-       ) where
-
-import Thermoprint
-import Thermoprint.Api
-import Database.Persist.TH
-
-type PrintOut = Block String
-
-derivePersistFieldJSON "PrintOut"
-- 
cgit v1.2.3