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 conflicts #8619

Merged
merged 1 commit into from
Sep 25, 2024
Merged

resolve conflicts #8619

merged 1 commit into from
Sep 25, 2024

Conversation

sainak
Copy link
Member

@sainak sainak commented Sep 25, 2024

Proposed Changes

  • resolve conflicts in nginx

@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

@sainak sainak requested a review from a team as a code owner September 25, 2024 09:06
Copy link

netlify bot commented Sep 25, 2024

Deploy Preview for care-ohc ready!

Name Link
🔨 Latest commit d87d477
🔍 Latest deploy log https://app.netlify.com/sites/care-ohc/deploys/66f3d29cf185940008b7b367
😎 Deploy Preview https://deploy-preview-8619--care-ohc.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link

Deploying care-fe with  Cloudflare Pages  Cloudflare Pages

Latest commit: d87d477
Status: ✅  Deploy successful!
Preview URL: https://2abcbc01.care-fe.pages.dev
Branch Preview URL: https://sainak-resolve-conflicts.care-fe.pages.dev

View logs

@khavinshankar khavinshankar merged commit 60068ad into develop Sep 25, 2024
23 of 24 checks passed
@khavinshankar khavinshankar deleted the sainak/resolve-conflicts branch September 25, 2024 09:07
Copy link

@sainak 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! 🙌

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.

2 participants