From: Jim Pryor <profjim@jimpryor.net>
Date: Tue, 24 Aug 2010 17:16:03 +0000 (-0400)
Subject: Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=3ac14d0e0a390c3afae43fa5664e8a69c769377a;hp=d8be476da34a56b5c268b2dbe62f93b0378eefca

Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
---

diff --git a/alpha.mdwn b/alpha.mdwn
index cd0eeb76..c22ccd4d 100644
--- a/alpha.mdwn
+++ b/alpha.mdwn
@@ -1,3 +1,5 @@
+prefix line
+
 testing alpha