# HG changeset patch # User Kevin Walker # Date 1277740476 25200 # Node ID 37f036dda03c19db5c442f48134f2b92ad004dbb # Parent 2e1b1efbf92819e7c918e8766f95737bb3951ed6# Parent a11a1a65cb6dbee5a5ec51f160e50a234282d86c Automated merge with https://tqft.net/hg/blob/ diff -r 2e1b1efbf928 -r 37f036dda03c text/intro.tex --- a/text/intro.tex Sun Jun 27 19:04:53 2010 -0700 +++ b/text/intro.tex Mon Jun 28 08:54:36 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]