Merge branch 'master'
authorHerbert Valerio Riedel <hvr@gnu.org>
Sat, 30 Dec 2017 10:59:44 +0000 (11:59 +0100)
committerHerbert Valerio Riedel <hvr@gnu.org>
Sat, 30 Dec 2017 10:59:44 +0000 (11:59 +0100)
1  2 
README.md
src/Text/Parsec/Combinator.hs
src/Text/Parsec/Expr.hs
src/Text/Parsec/Prim.hs

diff --cc README.md
Simple merge
Simple merge
Simple merge
Simple merge