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

Fixing unit testing conflict not detected by github during merge. #11689

Merged
merged 1 commit into from
Apr 17, 2020
Merged

Fixing unit testing conflict not detected by github during merge. #11689

merged 1 commit into from
Apr 17, 2020

Conversation

develric
Copy link
Contributor

This PR fixes a conflict in develop related to the merge of the #11683 PR.

To test

A CI without errors should be enough I think.

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

@develric develric added this to the 14.7 milestone Apr 17, 2020
@develric develric requested a review from malinajirka April 17, 2020 10:41
@peril-wordpress-mobile
Copy link

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link

You can test the changes on this Pull Request by downloading the APK here.

malinajirka
malinajirka approved these changes Apr 17, 2020
View reviewed changes
Copy link
Contributor

@malinajirka malinajirka left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@malinajirka malinajirka merged commit d534adf into develop Apr 17, 2020
@malinajirka malinajirka deleted the issue/11683-pr-fix-unit-test-conflict-in-develop branch April 17, 2020 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@malinajirka malinajirka malinajirka approved these changes

Assignees
No one assigned
Labels
Testing [Type] Bug
Projects
None yet
Milestone
14.7
Development

Successfully merging this pull request may close these issues.
2 participants
@develric @malinajirka