Merge remote-tracking branch 'origin/persistent2' into persistent2
Conflicts: esqueleto.cabal
This commit is contained in:
commit
deceb9f242
@ -63,7 +63,7 @@ library
|
|||||||
Database.Esqueleto.Internal.PersistentImport
|
Database.Esqueleto.Internal.PersistentImport
|
||||||
build-depends:
|
build-depends:
|
||||||
base >= 4.5 && < 4.8
|
base >= 4.5 && < 4.8
|
||||||
, text >= 0.11
|
, text >= 0.11 && < 1.2
|
||||||
, persistent >= 2.0 && < 2.1
|
, persistent >= 2.0 && < 2.1
|
||||||
, transformers >= 0.2
|
, transformers >= 0.2
|
||||||
, unordered-containers >= 0.2
|
, unordered-containers >= 0.2
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user