[Pkg-haskell-commits] darcs: haskell-testpack: Revert conflict

[John Goerzen]

Thu Feb 22 23:05:52 UTC 2007  John Goerzen <jgoerzen at complete.org>
  * Revert conflict
  Ignore-this: 2b82fefcfc8fa3b9d905aa55d521e6fc
  

    M ./control -1

Thu Feb 22 23:05:52 UTC 2007  John Goerzen <jgoerzen at complete.org>
  * Revert conflict
  Ignore-this: 2b82fefcfc8fa3b9d905aa55d521e6fc
  
diff -rN -u old-haskell-testpack//control new-haskell-testpack//control
--- old-haskell-testpack//control	2013-01-04 15:00:51.415721658 +0000
+++ new-haskell-testpack//control	2013-01-04 15:00:52.779724013 +0000
@@ -3,7 +3,6 @@
 Maintainer: John Goerzen <jgoerzen at complete.org>
 Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.6), ghc6 (<< 6.6-999), haskell-devscripts (>= 0.5.6), cpphs, libghc6-network-dev, libghc6-unix-dev, libghc6-mtl-dev, libghc6-hunit-dev, libghc6-quickcheck-dev, libghc6-filepath-dev, libghc6-hslogger-dev
 Build-Depends-Indep: debhelper (>= 4.0.0), haddock, hugs (>= 98.200503.08-4), haskell-devscripts (>= 0.5.6), ghc6 (>= 6.6), cpphs, libhugs-filepath, libhugs-hslogger
-Build-Conflicts: libhugs-filepath
 Standards-Version: 3.6.2
 Section: devel