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

Feature/ehrbase/project management/issues/288 sdt #67

Merged
merged 29 commits into from
Aug 18, 2020

Conversation

stefanspiska
Copy link
Contributor

@stefanspiska stefanspiska commented Aug 14, 2020

…/288_SDT

# Conflicts:
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AuslandDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KurzlicheReiseDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReiseDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/CategoryDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Language.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/MathFunctionDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/SettingDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Territory.java
…/288_SDT

# Conflicts:
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/AuslandDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnosestatusDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/DiagnostischeSicherheitDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/KurzlicheReiseDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentInVerwendungDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/MedikamentenklasseInVerwendungDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/PresenceOfAnyExposureEnDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/ReiseDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/coronaanamnesecomposition/definition/VorhandenseinDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/CategoryDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Language.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/MathFunctionDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/SettingDefiningcode.java
#	client/src/test/java/org/ehrbase/client/classgenerator/examples/shareddefinition/Territory.java
@jakesmolka jakesmolka merged commit a974871 into develop Aug 18, 2020
@jakesmolka jakesmolka deleted the feature/ehrbase/project_management/issues/288_SDT branch August 18, 2020 13: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.

None yet

2 participants