dph-prim-seq: fix merge conflict
authorBen Lippmeier <benl@ouroborus.net>
Mon, 29 Oct 2012 03:49:42 +0000 (14:49 +1100)
committerBen Lippmeier <benl@ouroborus.net>
Thu, 1 Nov 2012 00:39:50 +0000 (11:39 +1100)
commitb33769de75ea0f2535d9debad5eb58befc684728
treebfa29f96c71975f3d8a86cd48749b7c9731cf688
parent984460c21ac3e773f82bdc375803d8e9b1bd08c0
dph-prim-seq: fix merge conflict
dph-prim-seq/dph-prim-seq.cabal