archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-25 15:07:39 +00:00
Code Issues Projects Releases Wiki Activity

documentation: fix conflict

Browse Source
This commit is contained in:
Austen Collins 2015-08-09 11:48:59 -07:00
parent 1373b1bf46
commit 032dd152d1
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -8,11 +8,6 @@ This stack uses new tools from Amazon Web Services to completely redefine how to
##### To get started: [follow the "Installation Guide" in the Wiki](https://github.com/servant-app/JAWS/wiki/JAWS-Installation)
##### To help contribute: [check out the "JAWS Roadmap"](https://trello.com/b/tYOrT6nA/jaws-roadmap) and the ["Contributors Guide"](https://github.com/jaws-stack/JAWS/blob/master/CONTRIBUTING.md)
<<<<<<< HEAD
=======
>>>>>>> 6f1d87d52c143fb340593c51ee9616cda2310cad
## Goals: