# HG changeset patch
# User Kevin Walker <kevin@canyon23.net>
# Date 1277740476 25200
# Node ID 37f036dda03c19db5c442f48134f2b92ad004dbb
# Parent  2e1b1efbf92819e7c918e8766f95737bb3951ed6# Parent  a11a1a65cb6dbee5a5ec51f160e50a234282d86c
Automated merge with https://tqft.net/hg/blob/

diff -r a11a1a65cb6d -r 37f036dda03c build.xml
--- a/build.xml	Sun Jun 27 13:11:00 2010 -0700
+++ b/build.xml	Mon Jun 28 08:54:36 2010 -0700
@@ -63,6 +63,11 @@
     </target>
     
     <target name="copy-pdf" depends="pdf">
+        <exec executable="svn" dir="../../Sites/tqft.net/papers/">
+            <arg value="up"/>
+	    <arg value="--accept"/>
+	    <arg value="theirs-full"/>
+        </exec>
         <copy file="blob1.pdf" tofile="../../Sites/tqft.net/papers/blobs.pdf"/>
         <exec executable="svn" dir="../../Sites/tqft.net/papers/">
             <arg value="commit"/>
diff -r a11a1a65cb6d -r 37f036dda03c text/appendixes/smallblobs.tex
--- a/text/appendixes/smallblobs.tex	Sun Jun 27 13:11:00 2010 -0700
+++ b/text/appendixes/smallblobs.tex	Mon Jun 28 08:54:36 2010 -0700
@@ -119,7 +119,7 @@
 It may be useful to look at Figure \ref{fig:erectly-a-tent-badly} to help understand the arrangement. The red, blue and orange $2$-cells there correspond to the $m=0$, $m=1$ and $m=2$ terms respectively, while the $3$-cells (only one of each type is shown) correspond to the terms in the homotopy $h$.
 \begin{figure}[!ht]
 $$\mathfig{0.5}{smallblobs/tent}$$
-\caption{``Erecting a tent badly.'' We know where we want to send a simplex, and each of the iterated boundary components. However, these do not agree, and we need to stitch the pieces together. Note that these diagrams don't exactly match the situation in the text: a $k$-simplex has $k+1$ boundary components, while a $k$-blob has $k$ boundary terms.}
+\caption{``Erecting a tent badly.'' We know where we want to send a simplex, and each of the iterated boundary components. However, these do not agree, and we need to stitch the pieces together. Note that these diagrams don't exactly match the situation in the text: a $k$-simplex has $k+1$ boundary components, while a $k$-blob has $k$ boundary terms. \nn{turn upside?}}
 \label{fig:erectly-a-tent-badly}
 \end{figure}