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

Merge patches in main into develop #41

Merged
merged 4 commits into from
Nov 8, 2024

Conversation

RHammond2
Copy link
Collaborator

@RHammond2 RHammond2 commented Nov 8, 2024

Back-merge main to develop

This PR is updating the GreenHEART develop branch with patches in main.

PR Checklist

  • CHANGELOG.md has been updated to describe the changes made in this PR
  • Documentation
    • Docstrings are up-to-date
    • Related docs/ files are up-to-date, or added when necessary
    • Documentation has been rebuilt successfully
    • Examples have been updated
  • Tests pass (If not, and this is expected, please elaborate in the tests section)
  • PR description thoroughly describes the new feature, bug fix, etc.

Related issues

N/A

Impacted areas of the software

N/A

Additional supporting information

Keeping develop up to date.

Test results, if applicable

Tests pass.

RHammond2 and others added 4 commits November 1, 2024 17:00
* update PR template to be a bit more relevant

* udpate the bug report template

* update the feature request and replace duplicated text in the bug report

* update formatting so all descriptions are html comments

---------

Co-authored-by: John Jasa <[email protected]>
@RHammond2 RHammond2 merged commit eb6ad27 into develop Nov 8, 2024
6 checks passed
@RHammond2 RHammond2 deleted the back-merge-template-resolutions branch November 8, 2024 23:38
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.

1 participant