mirror of
https://github.com/gosticks/DefinitelyTyped.git
synced 2026-06-28 22:30:01 +00:00
Merge remote-tracking branch 'upstream/master' into multi-value_headers_and_query_params
This commit is contained in:
3
types/aws-lambda/index.d.ts
vendored
3
types/aws-lambda/index.d.ts
vendored
@@ -22,11 +22,8 @@
|
||||
// Louis Larry <https://github.com/louislarry>
|
||||
// Daniel Papukchiev <https://github.com/dpapukchiev>
|
||||
// Oliver Hookins <https://github.com/ohookins>
|
||||
<<<<<<< HEAD
|
||||
// Trevor Leach <https://github.com/trevor-leach>
|
||||
=======
|
||||
// James Gregory <https://github.com/jagregory>
|
||||
>>>>>>> upstream/master
|
||||
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
|
||||
// TypeScript Version: 2.3
|
||||
|
||||
|
||||
Reference in New Issue
Block a user