From 73230537baf50466956b79289729b8e69c4ace9e Mon Sep 17 00:00:00 2001 From: Ryan Culpepper Date: Fri, 8 Jul 2011 02:21:38 -0600 Subject: [PATCH] removed merge conflict artifact Merge to release branch --- collects/scribblings/reference/contracts.scrbl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/collects/scribblings/reference/contracts.scrbl b/collects/scribblings/reference/contracts.scrbl index 06c3183706..c71b9c3cc2 100644 --- a/collects/scribblings/reference/contracts.scrbl +++ b/collects/scribblings/reference/contracts.scrbl @@ -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