add a couple more conflicts
authorJesse Luehrs <doy@tozt.net>
Mon, 3 Jan 2011 20:29:51 +0000 (14:29 -0600)
committerJesse Luehrs <doy@tozt.net>
Mon, 3 Jan 2011 20:30:39 +0000 (14:30 -0600)
commit6045714d6197bbf0abe36fd65d619780274b567b
tree825f4dac18f0c1f691c9aee98a2b7a832872ec61
parentb783851897cfbe632d61cc20aa1b60dc52193b14
add a couple more conflicts
dist.ini
xt/author/test-my-dependents.t