From: Ferruccio Guidi <ferruccio.guidi@unibo.it>
Date: Mon, 11 Jun 2018 21:36:41 +0000 (+0200)
Subject: Merge branch 'master' of ssh://matita.cs.unibo.it:/srv/git/helm
X-Git-Tag: make_still_working~305
X-Git-Url: http://matita.cs.unibo.it/gitweb/?p=helm.git;a=commitdiff_plain;h=730642efca3fb00ca4f8268bd97b0778cff14514;hp=bb246930370226dc96c9b9121f59853a0a2f1434

Merge branch 'master' of ssh://matita.cs.unibo.it:/srv/git/helm

# Conflicts:
#	matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl
---

diff --git a/matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl b/matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl
index e6fd5b825..0ddb5a0b2 100644
--- a/matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl
+++ b/matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl
@@ -37,7 +37,7 @@ table {
 (*
              [ [ "" ] "shnv ( ⦃?,?⦄ ⊢ ? ¡[?,?,?] )" * ]
 *)
-             [ [ "for terms" ] "nv" + "( ⦃?,?⦄ ⊢ ? ![?,?] )" "nv_drops" + "nv_fqus" + "nv_aaa" + "snv_fsb" (* + "snv_lpr" + "snv_scpes" + "snv_preserve" *) * ]
+             [ [ "for terms" ] "nv" + "( ⦃?,?⦄ ⊢ ? ![?,?] )" "nv_drops" + "nv_fqus" + "nv_aaa" + "nv_fsb" (* + "snv_lpr" + "snv_scpes" + "snv_preserve" *) * ]
           }
         ]
      }