Mercurial > cortex

changeset 342:dc8de16d0051

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve thesis.org
author Robert McIntyre <rlm@mit.edu>
date Sat, 21 Jul 2012 23:39:05 -0500
parents 2e7d786241d3
children d6b1c486317d
files org/thesis.org
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/org/thesis.org	Sat Jul 21 12:20:43 2012 -0500
     1.2 +++ b/org/thesis.org	Sat Jul 21 23:39:05 2012 -0500
     1.3 @@ -5,9 +5,6 @@
     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 @@ -57,4 +54,4 @@
    1.14    
    1.15  * Simulated Imagination
    1.16  
    1.17 ->>>>>>> other
    1.18 +