X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?a=blobdiff_plain;f=intensionality_monad.mdwn;h=526404cb0b2b7b4a299f5d69bc58921b20c97b4f;hb=32ee6b1358736ac15bda2aac3074808ee022193a;hp=3b69ef9fb8101a91a19b3cc57889bc642b455048;hpb=01979f60c8474ffe20e4a1a20d59bfff5d3950c6;p=lambda.git

diff --git a/intensionality_monad.mdwn b/intensionality_monad.mdwn
index 3b69ef9f..526404cb 100644
--- a/intensionality_monad.mdwn
+++ b/intensionality_monad.mdwn
@@ -7,11 +7,9 @@ the same thing as making use of the reader monad.
 This technique was beautifully re-invented
 by Ben-Avi and Winter (2007) in their paper [A modular
 approach to
->>>>>>> f879a647e289a67b992caaafd497910259a81040
 intensionality](http://parles.upf.es/glif/pub/sub11/individual/bena_wint.pdf),
 though without explicitly using monads.
 
-
 All of the code in the discussion below can be found here: [[intensionality-monad.ml]].
 To run it, download the file, start OCaml, and say 
 
@@ -21,7 +19,7 @@ Note the extra `#` attached to the directive `use`.
 
 First, the familiar linguistic problem:
 
-       	   Bill left.  
+       Bill left.  
 	   Cam left.
 	   Ann believes [Bill left].
 	   Ann believes [Cam left].