git.iko.soy/typeable/aeson
on master help sign in
Merge
commit94b2e3f0070d017c55c59a5a261c1e0070079e94 authorBryan O'Sullivan <bos@serpentine.com> dateSun 13 Oct 2013, 20:59 (13 years ago) parent9f9c04dadd4758
2 files changed+4−3
compare with master
unifiedsplit
.hgtags+1 Data/Aeson/TH.hs+3−3
.hgtags+1
@@ -25,3 +25,4 @@ c292fe0c0808c7ecc576a98cd64931bc5e74b546 0.5.0.0
25253041d9f301a908355dfdb28d8cb0c2cba39e2491 0.6.0.2
2626b1770e9401a9ddb5a92543547d4faa3fd8576bd6 0.6.1.0
2727717ddce43a7f0a99b57a4ff832ba7c876243d520 0.6.2.0
28+52038e5c0ea396945bfb0926c5806b9484bb5d34 0.6.2.1
Data/Aeson/TH.hs+3−3
@@ -1,6 +1,6 @@
1−{-# LANGUAGE CPP, FlexibleInstances, NamedFieldPuns, NoImplicitPrelude,
2− OverlappingInstances, TemplateHaskell, UndecidableInstances, IncoherentInstances
3− #-}
1+{-# LANGUAGE CPP, FlexibleInstances, IncoherentInstances, NamedFieldPuns,
2+ NoImplicitPrelude, OverlappingInstances, TemplateHaskell,
3+ UndecidableInstances #-}
44
55{-|
66Module: Data.Aeson.TH