Skip to content

Commit f7e3f17

Browse files
fixed naming conflict that appeared when merging
1 parent 12f7e8f commit f7e3f17

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

theories/LambdaCube/Typing.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,10 @@ Proof.
292292
intro. destruct i; simpl. unfold bind_first at 1. simpl. destruct (lt_dec _ _).
293293
- rewrite bind_ren. rewrite bind_id.
294294
+ constructor. eapply typing_imp_ctx_wf; eassumption.
295-
+ unfold bind_first, weaken. simpl. intro. pose proof (proj2_sig k). simpl in *.
295+
+ unfold bind_first, weaken. simpl. intro i. pose proof (proj2_sig i). simpl in *.
296296
destruct (lt_dec _ _); try tauto. f_equal. apply sig_lt_ext. reflexivity.
297297
- rewrite bind_ren. rewrite bind_id; try assumption.
298-
unfold bind_first, weaken. simpl. intro. pose proof (proj2_sig k). simpl in *.
298+
unfold bind_first, weaken. simpl. intro i. pose proof (proj2_sig i). simpl in *.
299299
destruct (lt_dec _ _); try tauto. f_equal. apply sig_lt_ext. reflexivity.
300300
}
301301
clear. intros ? ? ? ? ? ? ? H tyx Γwf. induction tyx in n, σ, Γ, H, Γwf |- *; simpl in *; auto.

0 commit comments

Comments
 (0)