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 /spec | |
| 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 'spec')
| -rw-r--r-- | spec/src/Thermoprint/API.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/src/Thermoprint/API.hs b/spec/src/Thermoprint/API.hs index da16d32..6c020fc 100644 --- a/spec/src/Thermoprint/API.hs +++ b/spec/src/Thermoprint/API.hs | |||
| @@ -57,10 +57,10 @@ data JobStatus = Queued PrinterId | |||
| 57 | | Printing PrinterId | 57 | | Printing PrinterId |
| 58 | | Done | 58 | | Done |
| 59 | | Failed PrintingError | 59 | | Failed PrintingError |
| 60 | deriving (Generic, Show, Read, FromJSON, ToJSON) | 60 | deriving (Generic, Show, FromJSON, ToJSON) |
| 61 | 61 | ||
| 62 | data PrintingError = UnknownError | 62 | data PrintingError = UnknownError |
| 63 | deriving (Typeable, Generic, NFData, Show, ToJSON, Exception) | 63 | deriving (Typeable, Generic, NFData, Show, FromJSON, ToJSON, Exception) |
| 64 | 64 | ||
| 65 | type DraftTitle = Text | 65 | type DraftTitle = Text |
| 66 | 66 | ||