earthians / marley

Open Source Health Information System
https://frappehealth.com
GNU General Public License v3.0
298 stars 232 forks source link

refactor: update readme.md (backport #480) #481

Closed mergify[bot] closed 1 month ago

mergify[bot] commented 1 month ago
mergify[bot] commented 1 month ago

Cherry-pick of b789858f1188a89c39ec2cc8c1e5832de26037ea has failed:

On branch mergify/bp/version-14-hotfix/pr-480
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit b789858.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   README.md

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally