Stef Heyenrath fba1cb8489 Fix merge conflicts ...

Fix merge conflicts

2016-10-28 17:47:52 +02:00

..

aws-lambda-tests.ts

Fix merge conflicts

2016-10-28 17:47:52 +02:00

index.d.ts

Fixed code review comments

2016-10-26 07:46:34 +02:00

tsconfig.json

…