From 597e20a374048695f2e3a72fa4aed983eb0ff3cd Mon Sep 17 00:00:00 2001
From: Dmitry Vasilyev <vaseker@gmail.com>
Date: Wed, 16 Dec 2015 15:20:28 +0500
Subject: [PATCH] docs(quickstart): App component naming fix closes #554

---
 public/docs/js/latest/quickstart.jade | 4 ++++
 public/docs/ts/latest/quickstart.jade | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/docs/js/latest/quickstart.jade b/public/docs/js/latest/quickstart.jade
index 47328af9a6..66ba85277f 100644
--- a/public/docs/js/latest/quickstart.jade
+++ b/public/docs/js/latest/quickstart.jade
@@ -119,8 +119,12 @@ code-example(format="").
   We're creating a visual component named **`AppComponent`** by chaining the
   `Component` and `Class` methods that belong to the **global Angular core namespace, `ng.core`**.
   
+<<<<<<< 9e0096142321289089d6f19bf614631581b359bb
 +makeExample('quickstart/js/app/app.component.js', 'ng-namespace-funcs', 'app/app.component.js ' +
 '(Angular 2 methods)')(format=".")
+=======
++makeExample('quickstart/js/app/app.component.js', 'ng-namespace-funcs', 'app/app.component.js (Angular 2 methods)')(format=".")
+>>>>>>> App component naming fix
   
 :marked
   The **`Component`** method takes a configuration object with two
diff --git a/public/docs/ts/latest/quickstart.jade b/public/docs/ts/latest/quickstart.jade
index 7805b6eb91..f5df0a2448 100644
--- a/public/docs/ts/latest/quickstart.jade
+++ b/public/docs/ts/latest/quickstart.jade
@@ -141,7 +141,7 @@ code-example(format="").
   
   Most application files *export* one thing such as a component.
   Our `app.component` file exports the `AppComponent`.
-+makeExample('quickstart/ts/app/app.component.ts', 'export', 'app/component.ts (export)')(format=".")
++makeExample('quickstart/ts/app/app.component.ts', 'export', 'app/app.component.ts (export)')(format=".")
 :marked
   The act of exporting turns the file into a module.
   The name of the file (without extension) is usually the name of the module. 
@@ -172,7 +172,7 @@ code-example(format="").
   
   We define a component's metadata with the Angular `Component` function.
   We access that function by importing it from the primary Angular library,`angular2/core`.
-+makeExample('quickstart/ts/app/app.component.ts', 'import', 'app/component.ts (import)')(format=".")
++makeExample('quickstart/ts/app/app.component.ts', 'import', 'app/app.component.ts (import)')(format=".")
 :marked
   In TypeScript we apply that function to the class as a *decorator* 
   by prefixing it with the **@** symbol and invoking it