Chris Keogh c20d365021 fix merge conflicts

2017-09-14 14:30:55 +12:00

..

test_lambda.py

fix merge conflicts

2017-09-14 14:30:55 +12:00