Conflict(?).

From: asperti <asperti@c2b2084f-9a08-0410-b176-e24b037a169a>

diff --git a/helm/software/matita/nlibrary/arithmetics/nat.ma b/helm/software/matita/nlibrary/arithmetics/nat.ma
index 1ef6a81cbbfdc55f335481f199cfcc008f00218f..f15f8cbc858becfb524e6259b644cf6a7b841230 100644 (file)
--- a/helm/software/matita/nlibrary/arithmetics/nat.ma
+++ b/helm/software/matita/nlibrary/arithmetics/nat.ma
@@ -80,10 +80,6 @@ napply nat_elim2; #n;
  ##[ ncases n; /2/;
  ##| /3/;
  ##| #m; #Hind; ncases Hind;/3/;
- (* 
- ##[/2/; ##|#H; nwhd; 
-    napply or_introl;
-    napply eq_f2; /3/; *)
  ##]
 nqed. 
 
@@ -127,7 +123,7 @@ ntheorem associative_plus : associative nat plus.
 #n; nelim n; nnormalize; //; nqed.
 
 ntheorem assoc_plus1: ∀a,b,c. c + (b + a) = b + c + a.
-//; nqed.
+//; nqed. 
 
 ntheorem injective_plus_r: ∀n:nat.injective nat nat (λm.n+m).
 #n; nelim n; nnormalize; /3/; nqed.
@@ -261,6 +257,9 @@ ntheorem le_S_S: ∀n,m:nat. n ≤ m → S n ≤ S m.
 ntheorem le_O_n : ∀n:nat. O ≤ n.
 #n; nelim n; /2/; nqed.
 
+ntheorem nboh: 0 ≤ 0 + 0.
+//; nqed.
+
 ntheorem le_n_Sn : ∀n:nat. n ≤ S n.
 /2/; nqed.
 
@@ -276,8 +275,6 @@ ntheorem monotonic_pred: monotonic ? le pred.
 #n; #m; #lenm; nelim lenm; /2/;nqed.
 
 ntheorem le_S_S_to_le: ∀n,m:nat. S n ≤ S m → n ≤ m.
-(* XXX *) nletin hint ≝ monotonic. 
-#a; #b; #H; napplyS monotonic_pred;
 /2/; nqed.
 
 (* this are instances of the le versions 
@@ -453,9 +450,8 @@ ntheorem le_n_Sm_elim : ∀n,m:nat.n ≤ S m →
 (* le and eq *)
 
 ntheorem le_to_le_to_eq: ∀n,m. n ≤ m → m ≤ n → n = m.
-napply nat_elim2; 
-#n; #H1; #H2; /4/;
- nqed. 
+napply nat_elim2; /4/;
+nqed. 
 
 ntheorem lt_O_S : ∀n:nat. O < S n.
 /2/; nqed.