[Pkg-haskell-commits] darcs: ghc: Does this resolve all conflicts?

[Joachim Breitner]

Mon Oct  8 11:36:33 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Does this resolve all conflicts?
  Ignore-this: 338b925f413f050f9f140c12e485ce5

    M ./patches/series -1

Mon Oct  8 11:36:33 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Does this resolve all conflicts?
  Ignore-this: 338b925f413f050f9f140c12e485ce5
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series	2012-10-08 12:01:10.198727906 +0000
+++ new-ghc//patches/series	2012-10-08 12:01:10.250722457 +0000
@@ -5,4 +5,3 @@
 armhf_llvm_abi
 ARM-VFPv3D16
 no-missing-haddock-file-warning
-