From 4db24346004012491c1fb34d807cb9b497e1920c Mon Sep 17 00:00:00 2001 From: sw-yx Date: Mon, 21 Jan 2019 11:44:59 -0800 Subject: [PATCH] merge --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 044d8eb3..1b4ce472 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,6 @@ It also watches your files and restarts the dev server on change. Note: if you a - Function signatures follow the [AWS event handler](https://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-handler.html) syntax but must be named `handler`. [We use Node v8](https://www.netlify.com/blog/2018/04/03/node.js-8.10-now-available-in-netlify-functions/) so `async` functions **are** supported ([beware common mistakes](https://serverless.com/blog/common-node8-mistakes-in-lambda/)!). Read [Netlify Functions docs](https://www.netlify.com/docs/functions/#javascript-lambda-functions) for more info.
-<<<<<<< HEAD Environment variables in build and branch contextx Read Netlify's [documentation on environment variables](https://www.netlify.com/docs/continuous-deployment/#build-environment-variables). @@ -61,7 +60,6 @@ Read Netlify's [documentation on environment variables](https://www.netlify.com/ However, this is a [relatively new feature](https://github.com/netlify/netlify-lambda/issues/59), so if you encounter issues, file one.
-======= Lambda function examples @@ -97,7 +95,6 @@ export async function handler(event, context) { - the blogposts at the bottom of this README ->>>>>>> 46ea7abde5366413e079e9efb34655c40226e323 ## Using with `create-react-app`, Gatsby, and other development servers