Resolve a small conflict.
authorBryan O'Sullivan <bos@serpentine.com>
Tue, 15 Dec 2009 21:44:03 +0000 (21:44 +0000)
committerBryan O'Sullivan <bos@serpentine.com>
Tue, 15 Dec 2009 21:44:03 +0000 (21:44 +0000)
commitf4f922dfe0c871ce41c6350c5375cab86c0db887
tree2760e71d4c034f95bf565ce395b6b07152a49b52
parent6e69c37546034af83624680f33ccde1bc432313f
Resolve a small conflict.
parsec.cabal