Skip to content

Fix merge error#16045

Merged
js2357 merged 1 commit intojs2357/LocalizationAtPrimefrom
js2357/LAP2
Aug 21, 2024
Merged

Fix merge error#16045
js2357 merged 1 commit intojs2357/LocalizationAtPrimefrom
js2357/LAP2

Conversation

@js2357
Copy link
Copy Markdown
Collaborator

@js2357 js2357 commented Aug 21, 2024

Fix merge error


Open in Gitpod

@github-actions
Copy link
Copy Markdown

PR summary 4058d2cd43

Import changes for modified files

No significant changes to the import graph

Import changes for all files
Files Import difference
Mathlib.RingTheory.FractionalIdeal.LocalizedAtPrime 1251

Declarations diff

+ Field.isLocalization_self
+ coe_localizedAtPrime
+ exists_smul_mem_of_mem_localizedAtPrime
+ instance : IsFractionRing Aₚ K
+ instance : IsLocalizedModule P.primeCompl (I.localizedAtPrime_inclusion P)
+ instance : IsScalarTower A Aₚ K
+ localizedAtPrime_add
+ localizedAtPrime_div
+ localizedAtPrime_div_le
+ localizedAtPrime_inclusion
+ localizedAtPrime_inv
+ localizedAtPrime_mul
+ localizedAtPrime_ne_zero
+ localizedAtPrime_one
+ localizedAtPrime_zero
+ mem_localizedAtPrime_iff
+ mem_localizedAtPrime_iff_eq
+ not_le_of_localizedAtPrime_eq_one
+ self_subset_localizedAtPrime

You can run this locally as follows
## summary with just the declaration names:
./scripts/declarations_diff.sh <optional_commit>

## more verbose report:
./scripts/declarations_diff.sh long <optional_commit>

The doc-module for script/declarations_diff.sh contains some details about this script.

@js2357 js2357 merged commit 9f769e3 into js2357/LocalizationAtPrime Aug 21, 2024
@mathlib-bors mathlib-bors bot deleted the js2357/LAP2 branch August 21, 2024 21:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant