fixed merge

author Jim Pryor <profjim@jimpryor.net>

Mon, 20 Sep 2010 15:44:10 +0000 (11:44 -0400)

committer Jim Pryor <profjim@jimpryor.net>

Mon, 20 Sep 2010 15:44:10 +0000 (11:44 -0400)
author Jim Pryor <profjim@jimpryor.net>
Mon, 20 Sep 2010 15:44:10 +0000 (11:44 -0400)
committer Jim Pryor <profjim@jimpryor.net>
Mon, 20 Sep 2010 15:44:10 +0000 (11:44 -0400)
diff --cc code/lambda.js
Simple merge
diff --cc lambda-let.html

index 8abd350,307c408..fd8dece
--- 1/lambda-let.html
--- 2/lambda-let.html
+++ b/lambda-let.html
@@@ -1,7 -1,7 +1,7 @@@
   <html>
   <head>
- -<title>Lambda tutorial</title>
+ +<title>Lambda evaluator with lets</title>
- <script language=JavaScript src="lambda.js"></script>
+ <script language=JavaScript src="code/lambda.js"></script>
   </head>
   <body>
author	Jim Pryor <profjim@jimpryor.net>
	Mon, 20 Sep 2010 15:44:10 +0000 (11:44 -0400)
committer	Jim Pryor <profjim@jimpryor.net>
	Mon, 20 Sep 2010 15:44:10 +0000 (11:44 -0400)
		1	2
code/lambda.js	patch \|	diff1 \|	diff2 \|	blob \| history
lambda-let.html	patch \|	diff1 \|	diff2 \|	blob \| history