[commit: vector] master: Fix leftover conflicts (9890dc1)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/vector

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/9890dc1e3096d733f4112b1957c8d5cfca312aa4

>---------------------------------------------------------------

commit 9890dc1e3096d733f4112b1957c8d5cfca312aa4
Author: Roman Leshchinskiy <rl at cse.unsw.edu.au>
Date:   Sat Aug 27 23:21:46 2011 +0000

    Fix leftover conflicts

>---------------------------------------------------------------

 tests/vector-tests.cabal |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/vector-tests.cabal b/tests/vector-tests.cabal
index 112fc94..ac120d9 100644
--- a/tests/vector-tests.cabal
+++ b/tests/vector-tests.cabal
@@ -18,7 +18,7 @@ Build-Type:     Simple
 Executable "vector-tests-O0"
   Main-Is:  Main.hs
 
-  Build-Depends: base >= 4 && < 5, template-haskell, vector == 0.7.2,
+  Build-Depends: base >= 4 && < 5, template-haskell, vector == 0.8,
                  random,
                  QuickCheck >= 2, test-framework, test-framework-quickcheck2
 
@@ -53,4 +53,5 @@ Executable "vector-tests-O2"
               TemplateHaskell
 
   Ghc-Options: -O2
-  Ghc-Options: -Wall -fno-warn-orphans -fno-warn-missing-signatures -rtsopts -threaded
+  Ghc-Options: -Wall -fno-warn-orphans -fno-warn-missing-signatures
+