[commit: packages/pretty] master: Merge pull request #24 from osa1/master (bfc6295)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/bfc6295ed2d9755e824b9e148bf7d0b6d63d0130

>---------------------------------------------------------------

commit bfc6295ed2d9755e824b9e148bf7d0b6d63d0130
Merge: f93bc6f 60a5241
Author: David Terei <github at davidterei.com>
Date:   Thu Mar 19 01:46:35 2015 -0700

    Merge pull request #24 from osa1/master
    
    fix a comment that confuses Haddock



>---------------------------------------------------------------

bfc6295ed2d9755e824b9e148bf7d0b6d63d0130
 .travis.yml                                | 1 +
 src/Text/PrettyPrint/Annotated/HughesPJ.hs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)