# HG changeset patch # User Kevin Walker # Date 1277669460 25200 # Node ID a11a1a65cb6dbee5a5ec51f160e50a234282d86c # Parent ef36cdefb130f4d05e0b3b0cdbbd5e298d852fa3# Parent da479130b2a78f07007e99a592688c184a8aa899 Automated merge with https://tqft.net/hg/blob/ diff -r ef36cdefb130 -r a11a1a65cb6d text/intro.tex --- a/text/intro.tex Sun Jun 27 12:53:11 2010 -0700 +++ b/text/intro.tex Sun Jun 27 13:11:00 2010 -0700 @@ -68,8 +68,6 @@ The relationship between all these ideas is sketched in Figure \ref{fig:outline}. -\nn{KW: the previous two paragraphs seem a little awkward to me, but I don't presently have a good idea for fixing them.} - \tikzstyle{box} = [rectangle, rounded corners, draw,outer sep = 5pt, inner sep = 5pt, line width=0.5pt] \begin{figure}[!ht]