MLD1995 a1e63cd390e M Merge remote-tracking branch 'git_repo/master' into UP-304-add-tangram-medical-terminology-per-hta # Conflicts:
# input/sourceOfTruth/history/utgrel1hx-1-0-6.json
# input/utg.xml 21 Jul 2022 UP-304 MLD1995 fd90a8f7141 prep for implementation 21 Jul 2022 Ted Klein b2a55f24c3b final impl step UP-299 refresh master 16 Jul 2022 UP-299 Ted Klein 789807d7101 last step impl UP-299 16 Jul 2022 UP-299 Ted Klein 42c4b8ade94 step 2 impl 15 Jul 2022 Ted Klein 84e37906f0a M Merge commit 'e91d62820036d7add15ae68d33a940f743a25ba2' into UP-299-add-operationoutcome-code-for-failed-external-references 15 Jul 2022 UP-299 Ted Klein 66231b73a26 step 1 impl 15 Jul 2022 Ted Klein e91d6282003 M Merge branch 'master' of https://bitbucket.hl7.org/scm/utg/utg 15 Jul 2022 Ted Klein 13da8311575 M Merge commit '4c2e232219b4bbb1b772e8c3404d783deb3ac943' into UP-299-add-operationoutcome-code-for-failed-external-references # Conflicts:
# input/utg.xml 15 Jul 2022 UP-299 Ted Klein 4c2e232219b final step implementation of UP-163 15 Jul 2022 UP-163 Ted Klein e43a40d7474 M Merge commit '08c96c00708b60bca3fdd4f426defb6f49630f9b' # Conflicts:
# input-cache/schemas/R5/fhir-single.xsd
# input-cache/txcache/.capabilityStatement.cache
# input-cache/txcache/.terminologyCapabilities.cache
# input-cache/txcache/3.1.0/.capabilityStatement.cache
# input-cache/txcache/3.1.0/.terminologyCapabilities.cache
# input-cache/txcache/3.1.0/all-systems.cache
# input-cache/txcache/3.1.0/attribute-estimate-type.cache
# input-cache/txcache/3... 15 Jul 2022 Ted Klein 08c96c00708 step 3 impl update git branch 15 Jul 2022 Ted Klein e59b6f51a02 another try to fix the merge failure errors 14 Jul 2022 Ted Klein 1ee43db5403 update version and label for impl step 2 14 Jul 2022 Ted Klein 1ab2733556d Merge commit '119fd5e099c4cbc49d8fb4859fb25069333f0ea1' into UP-163-add-a-new-code-to-the-consent-policyrule-codesystem-valueset # Conflicts:
# input-cache/txcache/EPSG-GeodeticParameterDataset.cache
# input-cache/txcache/MSH.cache
# input-cache/txcache/SCDHEC-GISSpatialAccuracyTiers.cache
# input-cache/txcache/appointment-cancellation-reason.cache
# input-cache/txcache/epsg-ca.cache
# input-cache/txcache/epsg-crs.cache
# input-cache/txcache/hsloc.cache
# input-cache/txcache/http___ncithesaurus-stage.nci.nih.gov.cache
# ... 14 Jul 2022 UP-163 Ted Klein 5c1b7cf4370 version update for added code in code system 14 Jul 2022 Ted Klein 119fd5e099c tickle to see if master will rebuild 05 Jul 2022 Ted Klein 953b56ec008 refresh local master, check build 27 Jun 2022 MLD1995 d7465ae7a24 Updated the version of the operationoutcome code system 14 Jun 2022 MLD1995 8a2110fb12c M Merge remote-tracking branch 'git_repo/UP-163-add-a-new-code-to-the-consent-policyrule-codesystem-valueset' into UP-163-add-a-new-code-to-the-consent-policyrule-codesystem-valueset 14 Jun 2022 UP-163 MLD1995 f24d6b08ddd trying to force rebuild in github 14 Jun 2022 MLD1995 31d42f5072e forcing rebuild (first build failed when tx.fhir.org was down) 14 Jun 2022 alexander@fire.ly cb4d6810c37 Fix alphabetical order 07 Jun 2022 MLD1995 7f68607e580 M Merge remote-tracking branch 'git_repo/master' 19 May 2022 MLD1995 8e807ab1c9c Copy-paste error/curator error 19 May 2022 MLD1995 edba3c72ec6 M Merge remote-tracking branch 'git_repo/master' 19 May 2022 MLD1995 163e498063f Correcting odd merge conflict error 19 May 2022 MLD1995 859b927111c M Merge remote-tracking branch 'origin/UP-308-add-cms-ms-drg-per-hta' # Conflicts:
# input/sourceOfTruth/history/utgrel1hx-1-0-2.json
# input/utg.xml 18 May 2022 UP-308 MLD1995 9d51ba94413 fixing errors in history file 18 May 2022 MLD1995 ead80bb3a8b step 2 impl 18 May 2022 MLD1995 6084e89d560 M Merge remote-tracking branch 'origin/UP-295-add-clinvar-variation-id-per-hta' 18 May 2022 UP-295 MLD1995 f6013325beb step 2 impl 17 May 2022 MLD1995 bd224b3d623 Prep for content check 16 May 2022 MLD1995 7eb96351009 reverting pull request #8 04 May 2022 MLD1995 351cea6f470 Reverting pull request #8 04 May 2022 David Pyke 701551a3b65 M Pull request #8: FHIR-34215 Consent.scope: diff in codes shown Merge in UTG/utg from UP-255-re-add-the-code-adr-to-the-consent-scope-code-system to master
* commit '8371d5c599db8f994294f0d2e6f142357db62bcb':
prep for content check
FHIR-34215 Consent.scope: diff in codes shown 04 May 2022 2 Jira issuesMLD1995 551d79a732a M Merge remote-tracking branch 'origin/master' into UP-295-add-clinvar-variation-id-per-hta 03 May 2022 UP-295 MLD1995 9464ec786ee Step 2 impl 29 Apr 2022 MLD1995 b0b7756e930 M Merge remote-tracking branch 'git_repo/master' into UP-306-add-ada-area-of-oral-cavity-system-per-hta # Conflicts:
# input/sourceOfTruth/control-manifests/extcsmetadatarecords-Rendering.xml
# input/sourceOfTruth/control-manifests/techids-Rendering.xml 29 Apr 2022 UP-306 MLD1995 3e8ed73ac38 Fixed case error in history file 29 Apr 2022 MLD1995 eddacb43432 Removing '[up-305]' from label 29 Apr 2022 MLD1995 86a93998e6c M Merge remote-tracking branch 'git_repo/master' into UP-305-add-ada-universal-tooth-designation-system-per-hta # Conflicts:
# input/sourceOfTruth/history/utgrel1hx-1-0-1.json
# input/utg.xml 28 Apr 2022 UP-305 MLD1995 1034e1f7acc Step 2 impl 28 Apr 2022 MLD1995 11db803db4a M Merge remote-tracking branch 'origin/UP-307-remove-version-specific-information-from-cms-place-of-service-description' 28 Apr 2022 UP-307 MLD1995 cfb77251102 Fixed error in history file for this ticket and for up-302 28 Apr 2022 MLD1995 1d7909c5e78 removed [up-307] from label 28 Apr 2022 MLD1995 cdab2a24f86 added history file 28 Apr 2022 MLD1995 7fa450d0191 step 2 impl 28 Apr 2022 MLD1995 e3403eda186 M Merge remote-tracking branch 'origin/master' into UP-307-remove-version-specific-information-from-cms-place-of-service-description 28 Apr 2022 UP-307 MLD1995 9c51c3846ec removed [up-302] from label 28 Apr 2022