merge fixes/clarifications - change , to \land

diff --git a/merge.tex b/merge.tex
index 5e6dfdcc885879c0c036f6aafd28df9e6f5fc464..e9b5aa26c7272d039d3f14a33dfb098563c466dd 100644 (file)
--- a/merge.tex
+++ b/merge.tex
@@ -15,7 +15,7 @@ $L \in \pn$, $R \in \pry$, $M = \baseof{R}$.
 
 \subsection{Conditions}
 \[ \eqn{ Ingredients }{
 
 \subsection{Conditions}
 \[ \eqn{ Ingredients }{

- M \le L, M \le R
+ M \le L \land M \le R

 }\]
 \[ \eqn{ Tip Merge }{
  L \in \py \implies
 }\]
 \[ \eqn{ Tip Merge }{
  L \in \py \implies