nunit/nunit — pull request #424 by rprouse (2014-12-16 03:27:20+00:00)
Title: Removing conflicts from CHANGES.txt

While working on the install, I noticed that conflicts were checked into CHANGES.txt. I resolved the conflicts and also fixed up the formatting in places.