Resolve conflict
authorRoman Leshchinskiy <rl@cse.unsw.edu.au>
Sun, 29 Jan 2012 11:32:49 +0000 (11:32 +0000)
committerRoman Leshchinskiy <rl@cse.unsw.edu.au>
Sun, 29 Jan 2012 11:32:49 +0000 (11:32 +0000)
commitb058e75fa2c5b584c3a027c08e6e134a3deb2b70
tree2cddb1d4b4912236ed89929dfd77fecc6a8d22cd
parent993b4b28e6737b3f616fe380fa62aa74c0e369d7
Resolve conflict
vector.cabal