Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
fblanqui committed Sep 16, 2022
2 parents 16f4999 + 1476c05 commit 4ebc8c5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Util/Multiset/MultisetListOrder.v
Original file line number Diff line number Diff line change
Expand Up @@ -436,10 +436,10 @@ Module MultisetListOrder (ES : Eqset_dec).
subst; simpl; simpl in H1.
unfold mult, MultisetLT, transp; simpl.
constructor 1 with (X := {{a'}}) (Y :={{a}}) (Z := (list2multiset l));
auto with multisets.
unfold insert; simpl; auto with multisets.
[auto with multisets|..].
unfold insert; simpl.
rewrite union_comm; auto with multisets.
unfold insert; simpl; auto with multisets.
unfold insert; simpl.
rewrite union_comm; auto with multisets.
intros y Hy; assert (HY : y =A= a).
apply (member_singleton Hy).
Expand Down
2 changes: 1 addition & 1 deletion Util/Multiset/MultisetTheory.v
Original file line number Diff line number Diff line change
Expand Up @@ -1316,7 +1316,7 @@ Module Multiset (MC : MultisetCore).
rewrite (@singleton_mult_in b b); auto with sets.
rewrite (@singleton_mult_notin b a); eauto with sets.
rewrite (@singleton_mult_notin b c); eauto with sets.
rewrite (@singleton_mult_notin b d); eauto with sets.
rewrite (@singleton_mult_notin b d); [|eauto with sets].
lia.
setoid_replace c with d; eauto with sets.
apply meq_multeq; trivial.
Expand Down

0 comments on commit 4ebc8c5

Please sign in to comment.