Fix leftover conflicts
authorRoman Leshchinskiy <rl@cse.unsw.edu.au>
Sat, 27 Aug 2011 23:21:46 +0000 (23:21 +0000)
committerRoman Leshchinskiy <rl@cse.unsw.edu.au>
Sat, 27 Aug 2011 23:21:46 +0000 (23:21 +0000)
commit9890dc1e3096d733f4112b1957c8d5cfca312aa4
treeb705443ad6a8bc9459974535d4bbc4e8a6ef971e
parentd2b399d0bb891eea64e9c01c6e61cac557970b4a
Fix leftover conflicts
tests/vector-tests.cabal