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

Resolve conflict #1

Merged
merged 21 commits into from
Oct 16, 2024
Merged

Resolve conflict #1

merged 21 commits into from
Oct 16, 2024

Conversation

tellmeY18
Copy link
Owner

Proposed Changes

  • Fixes #issue_number
  • Change 1
  • Change 2
  • More?

@ohcnetwork/care-fe-code-reviewers

Merge Checklist

  • Add specs that demonstrate bug / test a new feature.
  • Update product documentation.
  • Ensure that UI text is kept in I18n files.
  • Prep screenshot or demo video for changelog entry, and attach it to issue.
  • Request for Peer Reviews
  • Completion of QA

@tellmeY18 tellmeY18 merged commit 2646ea3 into develop Oct 16, 2024
10 checks passed
Copy link

@tellmeY18 Your efforts have helped advance digital healthcare and TeleICU systems. 🚀 Thank you for taking the time out to make CARE better. We hope you continue to innovate and contribute; your impact is immense! 🙌

@tellmeY18 tellmeY18 deleted the resolve-conflict branch October 23, 2024 05:04
@tellmeY18 tellmeY18 restored the resolve-conflict branch October 23, 2024 05:04
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.

3 participants