Commits

Bryan O'Sullivan committed 07032a4 Merge

Merge

  • Participants
  • Parent commits 7a2d130, 020fd4e

Comments (0)

Files changed (3)

 3041d9f301a908355dfdb28d8cb0c2cba39e2491 0.6.0.2
 b1770e9401a9ddb5a92543547d4faa3fd8576bd6 0.6.1.0
 717ddce43a7f0a99b57a4ff832ba7c876243d520 0.6.2.0
+52038e5c0ea396945bfb0926c5806b9484bb5d34 0.6.2.1

File Data/Aeson/TH.hs

-{-# LANGUAGE CPP, FlexibleInstances, NamedFieldPuns, NoImplicitPrelude,
-    OverlappingInstances, TemplateHaskell, UndecidableInstances, IncoherentInstances
-  #-}
+{-# LANGUAGE CPP, FlexibleInstances, IncoherentInstances, NamedFieldPuns,
+    NoImplicitPrelude, OverlappingInstances, TemplateHaskell,
+    UndecidableInstances #-}
 
 {-|
 Module:      Data.Aeson.TH

File aeson.cabal

File contents unchanged.