removed merge conflict artifact

Merge to release branch
This commit is contained in:
Ryan Culpepper 2011-07-08 02:21:38 -06:00
parent fbccf38d50
commit 73230537ba

View File

@ -2013,8 +2013,3 @@ makes a binary search tree contract, but one that is
struct and returns a projection function that checks the contract.
}
<<<<<<< HEAD
=======
>>>>>>> 0b337dc... rejiggered things to make sure all mzlib/contract exports are documented