From 65959570cc03ee3de82eefcb2dc51d7ae9f3aebc Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Mar 2012 21:55:25 +0000
Subject: [PATCH] merge fixes/clarifications - change , to \land

---
 merge.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
2.30.2