fix merge errors

CODE_OF_CONDUCT.md

@@ -1,9 +1,6 @@
 ## Code of Conduct
-<<<<<<< HEAD
+
 This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). 
 For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact 
-=======
-This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
-For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
->>>>>>> 0d367091c143014a92a7d11f402dae1feaa4e0bc
+
 opensource-codeofconduct@amazon.com with any additional questions or comments.

CONTRIBUTING.md

@@ -1,28 +1,17 @@
 # Contributing Guidelines
 
-<<<<<<< HEAD
-Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional 
-documentation, we greatly value feedback and contributions from our community.
-
-Please read through this document before submitting any issues or pull requests to ensure we have all the necessary 
-=======
 Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional
 documentation, we greatly value feedback and contributions from our community.
 
 Please read through this document before submitting any issues or pull requests to ensure we have all the necessary
->>>>>>> 0d367091c143014a92a7d11f402dae1feaa4e0bc
 information to effectively respond to your bug report or contribution.
 
 
 ## Reporting Bugs/Feature Requests
 
 We welcome you to use the GitHub issue tracker to report bugs or suggest features.
 
-<<<<<<< HEAD
 When filing an issue, please check [existing open](https://github.com/aws-samples/amplify-photo-gallery-workshop/issues), or [recently closed](https://github.com/aws-samples/amplify-photo-gallery-workshop/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already 
-=======
-When filing an issue, please check existing open, or recently closed, issues to make sure somebody else hasn't already
->>>>>>> 0d367091c143014a92a7d11f402dae1feaa4e0bc
 reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
 
 * A reproducible test case or series of steps
@@ -47,30 +36,17 @@ To send us a pull request, please:
 5. Send us a pull request, answering any default questions in the pull request interface.
 6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
 
-<<<<<<< HEAD
 GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and 
-=======
-GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
->>>>>>> 0d367091c143014a92a7d11f402dae1feaa4e0bc
 [creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
 
 
 ## Finding contributions to work on
-<<<<<<< HEAD
 Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/aws-samples/amplify-photo-gallery-workshop/labels/help%20wanted) issues is a great place to start. 
 
 
 ## Code of Conduct
 This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). 
 For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact 
-=======
-Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any 'help wanted' issues is a great place to start.
-
-
-## Code of Conduct
-This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
-For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
->>>>>>> 0d367091c143014a92a7d11f402dae1feaa4e0bc
 opensource-codeofconduct@amazon.com with any additional questions or comments.
 
 
@@ -80,10 +56,6 @@ If you discover a potential security issue in this project we ask that you notif
 
 ## Licensing
 
-<<<<<<< HEAD
 See the [LICENSE](https://github.com/aws-samples/amplify-photo-gallery-workshop/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
-=======
-See the [LICENSE](LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
->>>>>>> 0d367091c143014a92a7d11f402dae1feaa4e0bc
 
 We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

LICENSE

@@ -1,6 +1,5 @@
 Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
-<<<<<<< HEAD
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software
 without restriction, including without limitation the rights to use, copy, modify,
@@ -13,18 +12,3 @@ PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIG
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=======
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
->>>>>>> 0d367091c143014a92a7d11f402dae1feaa4e0bc

README.md

@@ -1,58 +1,3 @@
-<<<<<<< HEAD
-This is the source code for [https://amplify-ios-workshop.go-aws.com/](https://amplify-ios-workshop.go-aws.com/)
-
-## Status
-
-**Oct 27**
-First draft of workshop instruction released
-
-**Oct 23**
-Workshop web site is scaffolded and deployment pipeline ready.
-
-**Oct 22**
-Final application is working and demo-able.  Some tweaks and improvements can be done, but I have a basis to start to write the core of the workshop now.
-
-### TODO
-
-- [ ] refactor code to download images asynchronously 
-- [ ] eliminate the TODO in the code
-- [ ] use Hugo page resource to load images
-- [ ] test and dry run
-- [X] refactor IAM permissions to use least priviledge
-- [ ] add reinvent specific instructions to use event engine accounts
-- [ ] ask guidance about best practices for Region choice.
-- [ ] add instruction to use other IDP (google, amazon)
-- [X] scaffold the workshop web site
-- [X] host the project on github + amplify console for hosting and CI/CD.  Use the shared evangelist account.
-- [X] write the workshop instructions
-- [X] add instructions for identity federation (section 6)
-- [X] add instruction to use a custom GUI screen (section 7)
-- [X] Fix landmark details page 
-- [X] code : cache downloaded images
-
-### Dir Structure
-
-```text
-x (you are here)
-|
-|-- code
-      |-- Complete       <== this is the final result of the workshop
-      |-- StartingPoint  <== this is the starting point of the app
-|
-|-- instructions         <== this is the static web site
-```
-
-### Deploy
-
-The instruction web site is generated with [Hugo](https://gohugo.io) and the [Learn theme](https://learn.netlify.com/en/).
-To build the web site :
-```
-cd instructions
-hugo
-```
-
-This site is automatically deployed to https://amplify-ios-workshop.go-aws.com
-=======
 ## My Project
 
 TODO: Fill this README out!
@@ -66,4 +11,3 @@ Be sure to:
 
 This library is licensed under the MIT-0 License. See the LICENSE file.
 
->>>>>>> 0d367091c143014a92a7d11f402dae1feaa4e0bc