idris-lang/Idris-dev — pull request #1085 by david-christiansen (2014-04-20 14:06:07+00:00)
Title: Fix merge conflicts from IdrisDoc

This is just a fix for the merge conflicts in #1074.