Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/canonical to new format #383

Merged
merged 15 commits into from
Mar 11, 2024
Merged

Conversation

patrick-werner
Copy link
Contributor

Please go the the Preview tab and select the appropriate sub-template:

Contributor PR

Version Upgrade (for Admins)

Pull Request Short Cut

patrick-werner and others added 14 commits March 4, 2024 12:48
feat: added Lebenszustand intermediate profile
…ufe-4-amts-observations

# Conflicts:
#	Resources/fsh-generated/fsh-index.json
#	Resources/fsh-generated/fsh-index.txt
#	Resources/fsh-generated/resources/StructureDefinition-ISiKAlkoholAbusus.json
#	Resources/fsh-generated/resources/StructureDefinition-ISiKRaucherStatus.json
#	Resources/fsh-generated/resources/StructureDefinition-ISiKSchwangerschaftErwarteterEntbindungstermin.json
#	Resources/fsh-generated/resources/StructureDefinition-ISiKSchwangerschaftsstatus.json
fix: typo in UebergreifendeFestlegungen_Suchparameter.md
…cal-to-new-format

# Conflicts:
#	Resources/fsh-generated/resources/Observation-ISiKStillstatusBeispiel.json
#	Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json
#	Resources/fsh-generated/resources/StructureDefinition-ISiKAlkoholAbusus.json
#	Resources/fsh-generated/resources/StructureDefinition-ISiKLebensZustand.json
#	Resources/fsh-generated/resources/StructureDefinition-ISiKRaucherStatus.json
#	Resources/fsh-generated/resources/StructureDefinition-ISiKSchwangerschaftErwarteterEntbindungstermin.json
#	Resources/fsh-generated/resources/StructureDefinition-ISiKSchwangerschaftsstatus.json
#	Resources/fsh-generated/resources/StructureDefinition-ISiKStillstatus.json
#	Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json
#	Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json
#	Resources/input/fsh/ISiKCapabilityStatementBasisServer.fsh
@MaxMTheilig MaxMTheilig self-requested a review March 11, 2024 15:43
Copy link
Contributor

@MaxMTheilig MaxMTheilig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vielen Dank!

@MaxMTheilig MaxMTheilig merged commit 38e57af into rc/main-stufe-4 Mar 11, 2024
1 check passed
@MaxMTheilig MaxMTheilig deleted the fix/canonical-to-new-format branch March 11, 2024 15:49
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.

2 participants