# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1342931945 18000
# Node ID dc8de16d0051ada4a7620065a724d27e5a0073ed
# Parent  2e7d786241d3bb03932fe692a900c338fdf774c6
resolve thesis.org

diff -r 2e7d786241d3 -r dc8de16d0051 org/thesis.org
--- a/org/thesis.org	Sat Jul 21 12:20:43 2012 -0500
+++ b/org/thesis.org	Sat Jul 21 23:39:05 2012 -0500
@@ -5,9 +5,6 @@
 #+keywords: AI, simulation, jMonkeyEngine3, clojure, virtual reality
 #+SETUPFILE: ../../aurellem/org/setup.org
 
-<<<<<<< local
-* 
-=======
 * COMMENT Multiple senses are compelling for AI.
 #+include: "./intro.org"
 
@@ -57,4 +54,4 @@
   
 * Simulated Imagination
 
->>>>>>> other
+