[Pkg-haskell-commits] darcs: haskell-parsec2: Fix conflicts

[laney at ubuntu.com]

Sun May 22 14:42:54 UTC 2011  laney at ubuntu.com
  * Fix conflicts
  Ignore-this: 5f76c754f49b7d1d4f85084f22b22a37

    M ./changelog -1 +4

Sun May 22 14:42:54 UTC 2011  laney at ubuntu.com
  * Fix conflicts
  Ignore-this: 5f76c754f49b7d1d4f85084f22b22a37
diff -rN -u old-haskell-parsec2//changelog new-haskell-parsec2//changelog
--- old-haskell-parsec2//changelog	2011-05-31 14:56:40.451782497 +0000
+++ new-haskell-parsec2//changelog	2011-05-31 14:56:40.455781087 +0000
@@ -8,7 +8,10 @@
   [ Marco Silva ]
   * Use ghc instead of ghc6
 
- -- Marco Túlio Gontijo e Silva <marcot at debian.org>  Thu, 18 Feb 2010 22:41:00 -0200
+  [ Iain Lane ]
+  * Standarcs-Version → 3.9.2, no changes required 
+
+ -- Iain Lane <laney at ubuntu.com>  Wed, 18 May 2011 17:31:41 +0100
 
 haskell-parsec2 (2.1.0.1-2) unstable; urgency=low