Skip to content

Fix merge error#1282

Merged
marcoskirsch merged 2 commits intomasterfrom
fix-merge-error
Feb 18, 2020
Merged

Fix merge error#1282
marcoskirsch merged 2 commits intomasterfrom
fix-merge-error

Conversation

@texasaggie97-zz
Copy link
Contributor

  • 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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants