From 40290f85c356ba720e4415a2cf6e219d0eae0e87 Mon Sep 17 00:00:00 2001 From: Matt Phillips Date: Sat, 3 Jun 2017 08:03:56 +0100 Subject: [PATCH] Fix readme conflict (#2148) --- readme.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/readme.md b/readme.md index c6d4bd1e..446dd5e2 100644 --- a/readme.md +++ b/readme.md @@ -869,11 +869,7 @@ Then run `now` and enjoy! Next.js can be deployed to other hosting solutions too. Please have a look at the ['Deployment'](https://github.com/zeit/next.js/wiki/Deployment) section of the wiki. -<<<<<<< HEAD -Note: we recommend putting `.next`, or your custom dist folder (you can set a custom folder in ['Custom Config'](https://github.com/zeit/next.js#custom-configuration)), in `.npmignore` or `.gitignore`. Otherwise, use `files` or `now.files` to opt-into a whitelist of files you want to deploy (and obviously exclude `.next` or your custom dist folder) -======= Note: we recommend putting `.next`, or your custom dist folder (Please have a look at ['Custom Config'](https://github.com/zeit/next.js#custom-configuration). You can set a custom folder in config, `.npmignore`, or `.gitignore`. Otherwise, use `files` or `now.files` to opt-into a whitelist of files you want to deploy (and obviously exclude `.next` or your custom dist folder). ->>>>>>> 0ec33c8ccdf8e55f6fedd64d7d358b030527813c ## Static HTML export