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

[Tools] Enable PHPCS for detect_conflicts.php #5994

Closed
wants to merge 2 commits into from
Closed

[Tools] Enable PHPCS for detect_conflicts.php #5994

wants to merge 2 commits into from

Conversation

johnsaigle
Copy link
Contributor

No description provided.

@johnsaigle johnsaigle added the Testing PR contains test plan or automated test code (or config files for Travis) label Jan 29, 2020
driusan
driusan requested changes Jan 30, 2020
View reviewed changes
tools/detect_conflicts.php Outdated Show resolved Hide resolved
@johnsaigle johnsaigle added the State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) label Feb 6, 2020
@stale
Copy link

stale bot commented Apr 6, 2020

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the State: Stale PR that has had no recent activity, needs to be triaged for review or closure to proceed label Apr 6, 2020
@laemtl laemtl mentioned this pull request Jun 30, 2020
Merged
@laemtl
Copy link
Contributor

laemtl commented Jun 30, 2020

Replaced by #6794

@laemtl laemtl closed this Jun 30, 2020
driusan pushed a commit that referenced this pull request Aug 3, 2020
@laemtl
[Tools] Enable PHPCS for detect_conflicts.php (#6794)
b14d20a 
Replaces #5994
spell00 pushed a commit to spell00/Loris that referenced this pull request Aug 13, 2020
@laemtl @spell00
[Tools] Enable PHPCS for detect_conflicts.php (aces#6794)
ff9cfba 
Replaces aces#5994
AlexandraLivadas pushed a commit to AlexandraLivadas/Loris that referenced this pull request Jun 15, 2021
@laemtl @AlexandraLivadas
[Tools] Enable PHPCS for detect_conflicts.php (aces#6794)
8d9d2f9 
Replaces aces#5994
AlexandraLivadas pushed a commit to AlexandraLivadas/Loris that referenced this pull request Jun 29, 2021
@laemtl @AlexandraLivadas
[Tools] Enable PHPCS for detect_conflicts.php (aces#6794)
388a8ee 
Replaces aces#5994
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@driusan driusan driusan requested changes

Assignees
No one assigned
Labels
State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) State: Stale PR that has had no recent activity, needs to be triaged for review or closure to proceed Testing PR contains test plan or automated test code (or config files for Travis)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@johnsaigle @laemtl @driusan