Fix Conflicts third try. #1714
Merged
Fix Conflicts third try. #1714
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge dev into master
SilasKenneth
requested review from
fey101,
millicentachieng,
rkodev and
andrueastman
andrueastman
approved these changes
Aug 16, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes missing snippets due to alternate keys. (Fixes missing snippets using alternate alternate keys. #1690)
Fix issue with writing DateOnly and TimeOnly properties. (Fix issue with writing DateOnly and TimeOnly properties. #1693)
Co-authored-by: Eastman andrueastman@users.noreply.github.com
Overview
Brief description of what this PR does, and why it is needed.
Demo
Optional. Screenshots,
curlexamples, etc.Notes
Optional. Ancillary topics, caveats, alternative strategies that didn't work out, anything else.
Testing Instructions