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.

Sign up for GitHub

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

Jump to bottom

Resolve merge conflict. #1711

Merged
merged 3 commits into from
Aug 15, 2023
Merged

Resolve merge conflict. #1711

merged 3 commits into from
Aug 15, 2023

Conversation

SilasKenneth
Copy link
Member

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, curl examples, etc.

Notes

Optional. Ancillary topics, caveats, alternative strategies that didn't work out, anything else.

Testing Instructions

  • How to test this PR
  • Prefer bulleted description
  • Start after checking out this branch
  • Include any setup required, such as bundling scripts, restarting services, etc.
  • Include test case, and expected output

millicentachieng and others added 3 commits July 27, 2023 16:01
@millicentachieng
Merge pull request #1692 from microsoftgraph/dev
5dbe376 
Merge dev into master
@SilasKenneth @andrueastman
Latest Dev changes (#1694)
33663a6 
* Fixes missing snippets due to alternate keys. (#1690)

* Fix issue with writing DateOnly and TimeOnly properties. (#1693)

---------

Co-authored-by: Eastman <andrueastman@users.noreply.github.com>
@SilasKenneth
Resolve merge conflict.
acd7887
@SilasKenneth SilasKenneth self-assigned this Aug 15, 2023
@SilasKenneth SilasKenneth changed the title Latest Dev changes (#1694) Resolve merge conflict. Aug 15, 2023
@SilasKenneth SilasKenneth marked this pull request as ready for review August 15, 2023 11:19
@SilasKenneth SilasKenneth requested a review from a team as a code owner August 15, 2023 11:19
@SilasKenneth SilasKenneth enabled auto-merge (squash) August 15, 2023 11:19
@sonarcloud
Copy link

sonarcloud bot commented Aug 15, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@SilasKenneth SilasKenneth merged commit 349f6a5 into dev Aug 15, 2023
9 checks passed
@SilasKenneth SilasKenneth deleted the fix/resolve-conflict branch August 15, 2023 11:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrueastman andrueastman andrueastman approved these changes

Assignees

@SilasKenneth SilasKenneth

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@SilasKenneth @andrueastman @millicentachieng