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.

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

Fix merge conflicts between #14 & #17 #18

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

Fix merge conflicts between #14 & #17 #18

wants to merge 7 commits into from

Commits on Dec 9, 2014

  1. Variables can be called with parameters specified in a condition

    Alexander Kurihara committed Dec 9, 2014
    Configuration menu
    Copy the full SHA
    5ee6773 View commit details
    Browse the repository at this point in the history

  2. Modify tests for variable parameters

    Alexander Kurihara committed Dec 9, 2014
    Configuration menu
    Copy the full SHA
    a97d908 View commit details
    Browse the repository at this point in the history

  3. Linting

    Alexander Kurihara committed Dec 9, 2014
    Configuration menu
    Copy the full SHA
    fa39831 View commit details
    Browse the repository at this point in the history

  4. Update README with variable parameters

    Alexander Kurihara committed Dec 9, 2014
    Configuration menu
    Copy the full SHA
    bf0a828 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2014

  1. Fix typo in README, rename variables for PEP8

    Alexander Kurihara committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    c2b361d View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2015

  1. Merge branch 'allow_parameters_on_variables' of github.com:akurihara/… 

    …business-rules
    @fuhrysteve
    fuhrysteve committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    13393d9 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2015

  1. Merge branch 'master' of github.com:gregeinfrank/business-rules 

    Conflicts:
	business_rules/variables.py
	tests/test_variables.py
    @fuhrysteve
    fuhrysteve committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    245a273 View commit details
    Browse the repository at this point in the history