Skip to content

Conversation

@gisellerosetta
Copy link
Contributor

Proposed Changes

  • Temporary fix to merge conflict

Related Issues

NA

Pre-requisites

This section may not be fully required if the branch is not merging into main.
Please indicate items that aren't necessary and why, with comments around incomplete checks.

  • Version number has been incremented, according to SemVer NA
  • Changelog has been updated, listing changes to this version. Use the keep a changelog format NA
  • New features are tested NA
  • New features are documented using the numpydoc docstring format NA
  • Other relevant package documentation is updated NA
  • For new functionality, examples are included in the docs or a feature request has
    been made for it/them. NA

gisellerosetta and others added 8 commits September 2, 2025 13:57
Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.12.3 to 1.13.0.
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](pypa/gh-action-pypi-publish@v1.12.3...v1.13.0)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-version: 1.13.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@gisellerosetta gisellerosetta changed the base branch from main to dev October 16, 2025 09:16
Copy link

@Jday7879 Jday7879 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does have the same line twice but hopefully this fixes conflict for now

@gisellerosetta gisellerosetta merged commit 4583029 into dev Oct 16, 2025
1 of 2 checks passed
@gisellerosetta gisellerosetta deleted the fix-conflict branch October 16, 2025 09:24
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