Mercurial > cortex

diff org/thesis.org @ 339:0efa36180e8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge changes from laptop
author Robert McIntyre <rlm@mit.edu>
date Sat, 21 Jul 2012 10:03:02 -0500
parents f4ef73370da1
children dc8de16d0051
line wrap: on
line diff
     1.1 --- a/org/thesis.org	Fri Jul 20 16:40:25 2012 -0500
     1.2 +++ b/org/thesis.org	Sat Jul 21 10:03:02 2012 -0500
     1.3 @@ -5,6 +5,9 @@
     1.4  #+keywords: AI, simulation, jMonkeyEngine3, clojure, virtual reality
     1.5  #+SETUPFILE: ../../aurellem/org/setup.org
     1.6  
     1.7 +<<<<<<< local
     1.8 +* 
     1.9 +=======
    1.10  * COMMENT Multiple senses are compelling for AI.
    1.11  #+include: "./intro.org"
    1.12  
    1.13 @@ -54,3 +57,4 @@
    1.14    
    1.15  * Simulated Imagination
    1.16  
    1.17 +>>>>>>> other