Code

Fix merge conflicts between #14 & #17#18

Code

Open

fuhrysteve wants to merge 7 commits intovenmo:mastervenmo/business-rules:masterfrom fuhrysteve:masterfuhrysteve/business-rules:masterCopy head branch name to clipboard

+176-36

Commits

Commits on Dec 9, 2014

• Variables can be called with parameters specified in a condition

  

  Alexander Kurihara

  committed
  5ee6773

• Modify tests for variable parameters

  

  Alexander Kurihara

  committed
  a97d908

• Linting

  

  Alexander Kurihara

  committed
  fa39831

• Update README with variable parameters

  

  Alexander Kurihara

  committed
  bf0a828

Commits on Dec 16, 2014

• Fix typo in README, rename variables for PEP8

  

  Alexander Kurihara

  committed
  c2b361d

Commits on Jan 12, 2015

• Merge branch 'allow_parameters_on_variables' of github.com:akurihara/business-rules

  fuhrysteve

  committed
  13393d9

Commits on Jan 13, 2015

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

  Show description for 245a273
  fuhrysteve

  committed
  245a273