Fix conflict

diff --cc core/destructors/destructors-docs.factor
index 1966f0b69f6e556c27121186dd2de19e5896b3f8,40482fce05eb4d8e18b230937b1e409ad3322d04..1abcba0720dcbe813420514888669f209576e154
--- 1/core/destructors/destructors-docs.factor
--- 2/core/destructors/destructors-docs.factor
+++ b/core/destructors/destructors-docs.factor
@@@ -8,10 -8,10 +8,10 @@@ HELP: dispos
  $nl
  "No further operations can be performed on a disposable object after this call."
  $nl
- "Disposing an object which has already been disposed should have no effect, and in particular it should not fail with an error. To help implement this pattern, add a " { $snippet "disposed" } " slot to your object and implement the " { $link dispose* } " method instead." }
+ "Disposing an object which has already been disposed should have no effect, and in particular it should not fail with an error. To help implement this pattern, add a " { $slot "disposed" } " slot to your object and implement the " { $link dispose* } " method instead." }
  { $notes "You must close disposable objects after you are finished working with them, to avoid leaking operating system resources. A convenient way to automate this is by using the " { $link with-disposal } " word."
  $nl
- "The default implementation assumes the object has a " { $snippet "disposable" } " slot. If the slot is set to " { $link f } ", it calls " { $link dispose* } " and sets the slot to " { $link t } "." } ;
 -"The default implementation assumes the object has a " { $slot "disposed" } " slot. If the slot is set to " { $link f } ", it calls " { $link dispose* } " and sets the slot to " { $link f } "." } ;
++"The default implementation assumes the object has a " { $snippet "disposed" } " slot. If the slot is set to " { $link f } ", it calls " { $link dispose* } " and sets the slot to " { $link t } "." } ;
  
  HELP: dispose*
  { $values { "disposable" "a disposable object" } }