X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=weblib%2Fflagtest%2Fprova.ma;h=cf8a896676a6d9c7cf704680fa28432c4b10a200;hb=647b419e96770d90a82d7a9e5e8843566a9f93ee;hp=f14392e9363b16d8b82eea79a35fcc25eafc7ccc;hpb=17e998b244d1edf335f6a5162d5e97c90484a3f7;p=helm.git

diff --git a/weblib/flagtest/prova.ma b/weblib/flagtest/prova.ma
index f14392e93..cf8a89667 100644
--- a/weblib/flagtest/prova.ma
+++ b/weblib/flagtest/prova.ma
@@ -1,3 +1,5 @@
+<<<<<<< .mine
+(* scriptino *)=======
 (*
     ||M||  This file is part of HELM, an Hypertextual, Electronic        
     ||A||  Library of Mathematics, developed at the Computer Science     
@@ -1116,3 +1118,4 @@ lemma le_maxr: ∀i,n,m. a href="cic:/matita/arithmetics/nat/max.def(2)"max/a
 lemma to_max: ∀i,n,m. n a title="natural 'less or equal to'" href="cic:/fakeuri.def(1)"≤/a i → m a title="natural 'less or equal to'" href="cic:/fakeuri.def(1)"≤/a i → a href="cic:/matita/arithmetics/nat/max.def(2)"max/a n m a title="natural 'less or equal to'" href="cic:/fakeuri.def(1)"≤/a i.
 #i #n #m #leni #lemi normalize (cases (a href="cic:/matita/arithmetics/nat/leb.fix(0,0,1)"leb/a n m)) 
 normalize // qed.
+>>>>>>> .r11514