# HG changeset patch
# User Kevin Walker <kevin@canyon23.net>
# Date 1312987838 21600
# Node ID 92bf1b37af9b24fe08ee84c5b81a180f14a63871
# Parent  0bebc467f65af47c7423878c1ae9b4bc089dde59# Parent  c9df0c67af5d76a0e3151638d2904488781d4732
dealing with merge failure

diff -r 0bebc467f65a -r 92bf1b37af9b text/ncat.tex
--- a/text/ncat.tex	Wed Aug 10 00:09:47 2011 -0700
+++ b/text/ncat.tex	Wed Aug 10 08:50:38 2011 -0600
@@ -1226,6 +1226,7 @@
 Note that this implies a $\Diff(B^n)$ action on $A$, 
 since $\cE\cB_n$ contains a copy of $\Diff(B^n)$.
 We will define a strict $A_\infty$ disk-like $n$-category $\cC^A$.
+(We enrich in topological spaces, though this could easily be adapted to, say, chain complexes.)
 If $X$ is a ball of dimension $k<n$, define $\cC^A(X)$ to be a point.
 In other words, the $k$-morphisms are trivial for $k<n$.
 If $X$ is an $n$-ball, we define $\cC^A(X)$ via a colimit construction.
@@ -1248,6 +1249,11 @@
 %\nn{The paper is already long; is it worth giving details here?}
 % According to the referee, yes it is...
 Let $A = \cC(B^n)$, where $B^n$ is the standard $n$-ball.
+We must define maps
+\[
+	\cE\cB_n^k \times A \times \cdots \times A \to A ,
+\]
+where $\cE\cB_n^k$ is the $k$-th space of the $\cE\cB_n$ operad.
 \nn{need to finish this}
 
 If we apply the homotopy colimit construction of the next subsection to this example,