From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Mar 2012 21:55:25 +0000 (+0000)
Subject: merge fixes/clarifications - change , to \land
X-Git-Tag: f0.2~19
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;ds=sidebyside;h=65959570cc03ee3de82eefcb2dc51d7ae9f3aebc;p=topbloke-formulae.git

merge fixes/clarifications - change , to \land
---

diff --git a/merge.tex b/merge.tex
index 5e6dfdc..e9b5aa2 100644
--- a/merge.tex
+++ b/merge.tex
@@ -15,7 +15,7 @@ $L \in \pn$, $R \in \pry$, $M = \baseof{R}$.
 
 \subsection{Conditions}
 \[ \eqn{ Ingredients }{
- M \le L, M \le R
+ M \le L \land M \le R
 }\]
 \[ \eqn{ Tip Merge }{
  L \in \py \implies