Index: doc/theses/colby_parsons_MMAth/text/channels.tex
===================================================================
--- doc/theses/colby_parsons_MMAth/text/channels.tex	(revision 0aef54988a056cb7811cb355c108a70531e7f89a)
+++ doc/theses/colby_parsons_MMAth/text/channels.tex	(revision 4897ffa5e2466ff9a784f13e117f1ccf68403830)
@@ -237,21 +237,7 @@
 \begin{lrbox}{\myboxB}
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
-<<<<<<< HEAD
-var cons_done, prod_done bool = false, false;
-var prodJoin chan int = make(chan int)
-var consJoin chan int = make(chan int)
-
-func consumer( channel chan uint64 ) {
-    for {
-        if cons_done { break }
-        <-channel
-    }
-    consJoin <- 0 // synch with main thd
-}
-=======
 channel( size_t ) chan{ 128 };
 thread Consumer {};
 thread Producer {};
->>>>>>> 8421d3fad6379460563c3a8922889a72c4d868fe
 
 void main( Producer & this ) {