removed merge conflict artifact

Merge to release branch (cherry picked from commit 73230537ba)
2011-07-08 02:21:38 -06:00 · 2011-07-08 02:21:38 -06:00 · fe3ee8cbc5
commit fe3ee8cbc5
parent 7d32a27700
1 changed files with 0 additions and 5 deletions
--- 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