diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2016-02-11 19:26:04 +0000 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2016-02-11 19:26:04 +0000 |
commit | 7d5c38236e7fd4b6fea6d5ff51e51127fc5e1795 (patch) | |
tree | b434a03b1440411faab77cd7e9c1b2c2430267c2 /server/src/Thermoprint/Server.hs | |
parent | e310456a054be6d62429c5f3b988da31cf502ced (diff) | |
parent | 7cf5bfd22b4eaa922b58d777776395173dbc05a3 (diff) | |
download | thermoprint-7d5c38236e7fd4b6fea6d5ff51e51127fc5e1795.tar thermoprint-7d5c38236e7fd4b6fea6d5ff51e51127fc5e1795.tar.gz thermoprint-7d5c38236e7fd4b6fea6d5ff51e51127fc5e1795.tar.bz2 thermoprint-7d5c38236e7fd4b6fea6d5ff51e51127fc5e1795.tar.xz thermoprint-7d5c38236e7fd4b6fea6d5ff51e51127fc5e1795.zip |
Merge branch 'rewrite' of git.yggdrasil.li:thermoprint into rewrite
Diffstat (limited to 'server/src/Thermoprint/Server.hs')
-rw-r--r-- | server/src/Thermoprint/Server.hs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/server/src/Thermoprint/Server.hs b/server/src/Thermoprint/Server.hs index 7767c12..8061b20 100644 --- a/server/src/Thermoprint/Server.hs +++ b/server/src/Thermoprint/Server.hs | |||
@@ -12,6 +12,7 @@ module Thermoprint.Server | |||
12 | , module Data.Default.Class | 12 | , module Data.Default.Class |
13 | , module Servant.Server.Internal.Enter | 13 | , module Servant.Server.Internal.Enter |
14 | , module Thermoprint.Server.Printer | 14 | , module Thermoprint.Server.Printer |
15 | , module Thermoprint.Server.Queue | ||
15 | ) where | 16 | ) where |
16 | 17 | ||
17 | import Data.Default.Class | 18 | import Data.Default.Class |
@@ -49,6 +50,7 @@ import Thermoprint.API (thermoprintAPI, PrinterId) | |||
49 | 50 | ||
50 | import Thermoprint.Server.Database | 51 | import Thermoprint.Server.Database |
51 | import Thermoprint.Server.Printer | 52 | import Thermoprint.Server.Printer |
53 | import Thermoprint.Server.Queue | ||
52 | import qualified Thermoprint.Server.API as API (thermoprintServer) | 54 | import qualified Thermoprint.Server.API as API (thermoprintServer) |
53 | import Thermoprint.Server.API hiding (thermoprintServer) | 55 | import Thermoprint.Server.API hiding (thermoprintServer) |
54 | 56 | ||