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 merge conflicts between #14 & #17 #18

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

fuhrysteve
Copy link

Fix merge conflicts between #14 & #17

@fuhrysteve
Copy link
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
@fuhrysteve fuhrysteve mentioned this pull request Jan 15, 2015
@akurihara
Copy link
Contributor

Hey @fuhrysteve thanks for doing the merge! Sorry for the delay, I'll be able to review this soon.

@gregeinfrank
Copy link
Contributor

@akurihara any update on this? I don't have write access (again) so I can't merge my PR in either (#17)

@akurihara
Copy link
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
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.

3 participants