Skip to content

[ticket/17555] Try to get win test timeout to work#6939

Closed
iMattPro wants to merge 3 commits intophpbb:3.3.xfrom
iMattPro:ticket/17555
Closed

[ticket/17555] Try to get win test timeout to work#6939
iMattPro wants to merge 3 commits intophpbb:3.3.xfrom
iMattPro:ticket/17555

Conversation

@iMattPro
Copy link
Member

@iMattPro iMattPro commented Mar 9, 2026

PHPBB-17555

Checklist:

  • Correct branch: master for new features; 3.3.x for fixes
  • Tests pass
  • Code follows coding guidelines: master and 3.3.x
  • Commit follows commit message format

Tracker ticket:

https://tracker.phpbb.com/browse/PHPBB-17555

@github-actions
Copy link

github-actions bot commented Mar 9, 2026

The attempt to merge branch 3.3.x into master has completed after considering the changes in this PR.

  • Merge result: Conflict ❌

A separate PR will be needed to merge 3.3.x into master.

@iMattPro
Copy link
Member Author

iMattPro commented Mar 9, 2026

I give up!

@iMattPro iMattPro closed this Mar 9, 2026
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