Merge pull request #6 from stevjohnson/develop

Steve Johnson · Steve Johnson · commit b8a3707333ab · 2014-12-06T12:46:16.000-06:00
Merge changes from PR77
diff --git a/_includes/header_m2devgde - Copy.html b/_includes/header_m2devgde - Copy.html
diff --git a/common/test.txt b/common/test.txt
@@ -0,0 +1,2 @@
+Hello
+Goodbye
diff --git a/guides/m2devgde/v1.0.0.0/integration/integration-auth.md b/guides/m2devgde/v1.0.0.0/integration/integration-auth.md
@@ -7,6 +7,8 @@ title: Understanding Integration Authorization
 
 <p><a href="{{ site.githuburl }}guides/m2devgde/v1.0.0.0/integration/integration-auth.md" target="_blank"><em>Help us improve this page</em></a>&nbsp;<img src="{{ site.baseurl }}common/images/newWindow.gif"/></p>
 
+Hello!
+
 You can authenticate an integrated third-party system with Magento in any of the following ways:
 
 *  (Preferred) Using a secure, cloud-based OAuth workflow
diff --git a/guides/m2devgde/v1.0.0.0/webapi/steve-test.md b/guides/m2devgde/v1.0.0.0/webapi/steve-test.md
@@ -0,0 +1,14 @@
+---
+layout: howtom2devgde_chapters
+title: SteveJ Test - please don't remove
+---
+ 
+<h1 id="m2devgde-test">{{ page.title }}</h1>
+
+File from branch 1:
+
+<a href="https://github.corp.ebay.com/stevjohnson/GitHubCodetest/raw/branch1/di.xml">di.xml</a>
+
+File from branch 2:
+
+<a href="https://github.corp.ebay.com/stevjohnson/GitHubCodetest/raw/branch2/di.xml">di.xml</a>
