Skip to content

Fix merge error #1282

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
Merged
marcoskirsch merged 2 commits into from
Feb 18, 2020
Merged

Fix merge error #1282

marcoskirsch merged 2 commits into from
Feb 18, 2020

Conversation

@texasaggie97-zz
Copy link
Contributor

@texasaggie97-zz texasaggie97-zz commented Feb 18, 2020

  • This contribution adheres to CONTRIBUTING.md.
  • I've updated CHANGELOG.md if applicable.
  • I've added tests applicable for this pull request

What does this Pull Request accomplish?

  • Fixes a merge error where the wrong condition was being used to add dependencies between environments in the system_tests tox ini file

List issues fixed by this Pull Request below, if any.

What testing has been done?

  • System
  • Visual inspection of generated files

@marcoskirsch marcoskirsch merged commit 8be3f9e into master Feb 18, 2020
@marcoskirsch marcoskirsch deleted the fix-merge-error branch February 18, 2020 22:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marcoskirsch marcoskirsch marcoskirsch 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.

3 participants

@texasaggie97-zz @marcoskirsch