Clean up from merge conflict message.

Signed-off-by: Kristal Dale <kristal.dale@intel.com>
This commit is contained in:
Kristal Dale
2018-11-07 15:31:25 -08:00
parent 8de92f42d7
commit aa9fe2bd27
@@ -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::