bitcoin/bitcoin — pull request #3720 by laanwj (2014-02-21 15:34:48+00:00)
Title: Remove "conflicted" as transaction category.

We were losing information about sent/received by overriding the category in case of a conflicted transaction.

Hence, remove the "conflicted" category.

Conflicted status of a transaction can still be determined by looking for confirmations<0.