From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 11 Mar 2012 11:07:12 +0000 (+0000)
Subject: merge wip
X-Git-Tag: f0.2~107
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=b7f22e91986803c958f290b6147c2e8be6f44fe0;hp=450c63c9959be28a023c1e8a9276b0c9954fce4f

merge wip
---

diff --git a/article.tex b/article.tex
index f73f722..25946fa 100644
--- a/article.tex
+++ b/article.tex
@@ -690,26 +690,6 @@ $\baseof{C} = R$ so $D \isin C \equiv D \isin \baseof{C}$.  OK.
 
 $\qed$
 
-xxx junk after here
-
-%D \in \py$:}
-
-
-
-xxx the coherence is not that useful ?
-
-$L \haspatch \p$ by 
-
-xxx need to recheck this
-
-$C \in \py$ $C \haspatch P$ so $D \isin C \equiv D \le C$.  OK.
-
-\subsubsection{For $L \in \py, D \not\in \py, R \in \py$:}
-
-Tip Contents for $L$: $D \isin L \equiv D \isin \baseof{L}$.
-
-Tip Contents for $R$: $D \isin R \equiv D \isin \baseof{R}$.
-
-But by Tip Merge, $\baseof{R} \ge \baseof{L}$
+xxx up to here, need to prove other things about merges
 
 \end{document}