From aa9fe2bd2714e12e92525d885a87a90c3f8e3e5f Mon Sep 17 00:00:00 2001 From: Kristal Dale Date: Wed, 7 Nov 2018 15:31:25 -0800 Subject: [PATCH] Clean up from merge conflict message. Signed-off-by: Kristal Dale --- source/clear-linux/tutorials/greengrass.rst | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/source/clear-linux/tutorials/greengrass.rst b/source/clear-linux/tutorials/greengrass.rst index 9ffb7239..61c2c772 100644 --- a/source/clear-linux/tutorials/greengrass.rst +++ b/source/clear-linux/tutorials/greengrass.rst @@ -188,19 +188,6 @@ Creating and Packaging Lambda Functions ======================================= #. Complete the tutorial at `Configure AWS Greengrass on AWS IoT`_ . -<<<<<<< HEAD - - .. note:: - - This creates the tarball needed to create the AWS Greengrass - environment on the edge device. - -#. Assure to download both the security resources and the AWS Greengrass - core software. - - .. note:: - -======= .. note::