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.

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

fix(tests): fix test after hard resolving conflicts. #3946

Merged
merged 1 commit into from
Mar 7, 2018

Conversation

YevheniiaMazur
Copy link

PR Checklist

Before creating new PR, please take a look at checklist below to make sure that you've done everything that needs to be done before we can merge it.

  • read and followed the CONTRIBUTING.md guide.
  • built and tested the changes locally.
  • added/updated tests.
  • added/updated API documentation.
  • added/updated demos.

@ghost ghost assigned YevheniiaMazur Mar 7, 2018
@ghost ghost added the in progress label Mar 7, 2018
@YevheniiaMazur YevheniiaMazur requested a review from valorkin March 7, 2018 15:40
@valorkin valorkin merged commit 5955ca7 into development Mar 7, 2018
@valorkin valorkin deleted the fix-e2e-after-resolving-conf branch March 7, 2018 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants