diff org/comprehend-singularity.org @ 69:2097f7685a3b

merge.
author Robert McIntyre <rlm@mit.edu>
date Sun, 13 Oct 2013 12:09:05 -0400
parents eae81fa3a8e0
children
line wrap: on
line diff
     1.1 --- a/org/comprehend-singularity.org	Sun Oct 13 12:06:09 2013 -0400
     1.2 +++ b/org/comprehend-singularity.org	Sun Oct 13 12:09:05 2013 -0400
     1.3 @@ -27,4 +27,4 @@
     1.4  
     1.5  So, far in the future, when synthetic life rules the stars, it is
     1.6  likely that their behavour will still be describable in the simplistic
     1.7 -terms of the human stories of old.
     1.8 \ No newline at end of file
     1.9 +terms of the human stories of old.