From f344b250f6f062a1a1902bf69b23ebf9b565de0e Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Sat, 17 Sep 2016 15:01:51 -0700
Subject: 3395

---
 html/031merge.cc.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'html/031merge.cc.html')

diff --git a/html/031merge.cc.html b/html/031merge.cc.html
index 0642eab2..9f3e8440 100644
--- a/html/031merge.cc.html
+++ b/html/031merge.cc.html
@@ -37,8 +37,8 @@ body { font-size: 12pt; font-family: monospace; color: #eeeeee; background-color
 
 <span class="Delimiter">:(scenario merge)</span>
 container foo [
-  <span class="Normal">x</span>:number
-  <span class="Normal">y</span>:number
+  <span class="Normal">x</span>:num
+  <span class="Normal">y</span>:num
 ]
 def main [
   <span class="Constant">1</span>:foo<span class="Special"> &lt;- </span>merge <span class="Constant">3</span><span class="Delimiter">,</span> <span class="Constant">4</span>
@@ -247,9 +247,9 @@ Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</spa
 <span class="Delimiter">:(scenario merge_check_product)</span>
 <span class="Special">% Hide_errors = true;</span>
 def main [
-  <span class="Constant">1</span>:number<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>
+  <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>merge <span class="Constant">3</span>
 ]
-<span class="traceContains">+error: main: 'merge' should yield a container in '1:number &lt;- merge 3'</span>
+<span class="traceContains">+error: main: 'merge' should yield a container in '1:num &lt;- merge 3'</span>
 
 <span class="Delimiter">:(before &quot;End Includes&quot;)</span>
 <span class="PreProc">#include </span><span class="Constant">&lt;stack&gt;</span>
-- 
cgit 1.4.1-2-gfad0