Merge pull request aws-samples#483 from buzzsurfr/master

buzzsurfr · web-flow · commit a118288e2b54 · 2018-06-11T06:07:25.000-04:00
Uses the AWS Code of Conduct
diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc
@@ -0,0 +1,4 @@
+== Code of Conduct
+This project has adopted the link:https://aws.github.io/code-of-conduct[Amazon Open Source Code of Conduct].
+For more information see the link:https://aws.github.io/code-of-conduct-faq[Code of Conduct FAQ] or contact
+opensource-codeofconduct@amazon.com with any additional questions or comments.

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +== Code of Conduct
 +This project has adopted the link:https://aws.github.io/code-of-conduct[Amazon Open Source Code of Conduct].
 +For more information see the link:https://aws.github.io/code-of-conduct-faq[Code of Conduct FAQ] or contact
 +[email protected] with any additional questions or comments.