also skip the conflicts script
authorJesse Luehrs <doy@tozt.net>
Mon, 28 Mar 2011 00:49:04 +0000 (19:49 -0500)
committerJesse Luehrs <doy@tozt.net>
Mon, 28 Mar 2011 00:49:04 +0000 (19:49 -0500)
commitfb57ca9f52f30bb6836f8729e4bdcdbc0d4fa914
tree17167e43dfa430e02bda4e2746a97081c3f43f96
parenta44d6c33c97eeb2d9d51d291ba3e466a28d22c65
also skip the conflicts script
dist.ini