Added status to conflict(8) man page to note that it is deprecated.
[mmh] / VERSION
1 1.5+dev