Mercurial > cortex

changeset 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 d37ccb6c888f
children 4f5a5d5f1613
files org/proposal.org org/thesis.org
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/org/proposal.org	Fri Jul 20 16:40:25 2012 -0500
     1.2 +++ b/org/proposal.org	Sat Jul 21 10:03:02 2012 -0500
     1.3 @@ -1,1 +0,0 @@
     1.4 -

     2.1 --- a/org/thesis.org	Fri Jul 20 16:40:25 2012 -0500
     2.2 +++ b/org/thesis.org	Sat Jul 21 10:03:02 2012 -0500
     2.3 @@ -5,6 +5,9 @@
     2.4  #+keywords: AI, simulation, jMonkeyEngine3, clojure, virtual reality
     2.5  #+SETUPFILE: ../../aurellem/org/setup.org
     2.6  
     2.7 +<<<<<<< local
     2.8 +* 
     2.9 +=======
    2.10  * COMMENT Multiple senses are compelling for AI.
    2.11  #+include: "./intro.org"
    2.12  
    2.13 @@ -54,3 +57,4 @@
    2.14    
    2.15  * Simulated Imagination
    2.16  
    2.17 +>>>>>>> other