Fix merge conflicts between #14 & #17 #18
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Author
|
@akurihara and @gregeinfrank I merged the conflicts between your two pull requests.. can y'all review when you get a chance? Some of it was a bit tricky... |
Conflicts: business_rules/variables.py tests/test_variables.py
Open
Contributor
|
Hey @fuhrysteve thanks for doing the merge! Sorry for the delay, I'll be able to review this soon. |
Contributor
|
@akurihara any update on this? I don't have write access (again) so I can't merge my PR in either (#17) |
Contributor
|
Hey @fuhrysteve and @gregeinfrank, @manda986 and I reviewed #17 and it looks good - we will merge it in today. #14 needs some further testing so that it's backwards compatible with the current business-rules-ui, so we're going to hold off on that one. We will address merge conflicts when that's ready. |
vrsandeep
pushed a commit
to vrsandeep/business-rules
that referenced
this pull request
May 31, 2019
Use relative imports
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix merge conflicts between #14 & #17