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.

Sign up for GitHub

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

Jump to bottom

Resolve merge conflicts #3123

Merged
merged 5 commits into from
Sep 2, 2024
Merged

Resolve merge conflicts #3123

merged 5 commits into from
Sep 2, 2024

Conversation

yubiuser
Copy link
Member

@yubiuser yubiuser commented Sep 2, 2024

dev-v6 -> devel

By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.
  • I have read the above and my PR is ready for review. Check this box to confirm

dependabot bot and others added 5 commits August 24, 2024 10:23
@dependabot
Bump phpstan/phpstan from 1.11.10 to 1.11.11
2d500a0 
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.11.10 to 1.11.11.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.12.x/CHANGELOG.md)
- [Commits](phpstan/phpstan@1.11.10...1.11.11)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump phpstan/phpstan from 1.11.10 to 1.11.11 (#3116)
a2b1b73
@dependabot
Bump phpstan/phpstan from 1.11.11 to 1.12.0
ea2bb4b 
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.11.11 to 1.12.0.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.12.x/CHANGELOG.md)
- [Commits](phpstan/phpstan@1.11.11...1.12.0)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@yubiuser
Bump phpstan/phpstan from 1.11.11 to 1.12.0 (#3121)
953a592
@yubiuser
Merge branch 'devel' into resolve_merge
a087cc3 
Signed-off-by: yubiuser <github@yubiuser.dev>
@yubiuser yubiuser requested a review from a team September 2, 2024 12:42
DL6ER
DL6ER approved these changes Sep 2, 2024
View reviewed changes
Copy link
Member

@DL6ER DL6ER left a comment

Choose a reason for hiding this comment

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

Merges cleanly

@DL6ER DL6ER merged commit 84f10b3 into development-v6 Sep 2, 2024
7 checks passed
@DL6ER DL6ER deleted the resolve_merge branch September 2, 2024 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DL6ER DL6ER DL6ER approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@yubiuser @DL6ER