# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1385854537 18000
# Node ID 18cec87dbd9cac7b7b80483dea50ae636ea71648
# Parent  ca1cd5bab77d31a5ba2d28cbe4a24ac5a665889e
candy screw.

diff -r ca1cd5bab77d -r 18cec87dbd9c org/ideas.org
--- a/org/ideas.org	Sat Nov 16 17:48:39 2013 -0500
+++ b/org/ideas.org	Sat Nov 30 18:35:37 2013 -0500
@@ -31,6 +31,10 @@
 getting credit.
 #+end_quote
 
+<<<<<<< local
+- candy screw :: edible candy screw with candy nuts that you can screw
+                 as well. 
+=======
 - better bibliography :: when writing a thesis or paper, have the
      biblography not just be an opaque list of resources, but have it
      be a list of /summaries/ and /qualities/ that each paper has in
@@ -42,7 +46,10 @@
      provide information about the referenced papers from the
      author's perspective. I will use this biblographic form in my own
      thesis. 
+>>>>>>> other
 
+<<<<<<< local
+=======
 - digital inter-library loan :: libraries at universities already do
      interlibrary loans for books, so why not do the same for access
      to stupid paywalled digital papers? All the universities could
@@ -53,6 +60,7 @@
      can access the proxy network. Access to the proxy network could
      be made easy using something like http://libx.org/.
 
+>>>>>>> other
 - chess visual :: to show the vast size of the game trees considered
                   by computers, show two people playing chess in a
                   void. They are floating in space, and there is a