From: Chris Barker <barker@kappa.linguistics.fas.nyu.edu>
Date: Mon, 1 Nov 2010 19:15:52 +0000 (-0400)
Subject: Added assignmemnt 6
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=c50557f9e28953396ce6b09d169096d848a1985e;ds=inline

Added assignmemnt 6
---

diff --git a/intensionality_monad.mdwn b/intensionality_monad.mdwn
index 3b69ef9f..39dd8028 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