From 032dd152d170200beff0b8aeffdd9dfcc7a06100 Mon Sep 17 00:00:00 2001 From: Austen Collins Date: Sun, 9 Aug 2015 11:48:59 -0700 Subject: [PATCH] documentation: fix conflict --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 4350bb921..2fc8c88b4 100755 --- a/README.md +++ b/README.md @@ -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: