From f697e01b76b5d8f2baf08864a02601d9b3f1a9cc Mon Sep 17 00:00:00 2001 From: Naomi Black Date: Thu, 17 Dec 2015 11:38:14 -0800 Subject: [PATCH] chore(merge): fix a bad rebase merge left in the doc --- public/docs/js/latest/quickstart.jade | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/public/docs/js/latest/quickstart.jade b/public/docs/js/latest/quickstart.jade index 66ba85277f..177d798d4b 100644 --- a/public/docs/js/latest/quickstart.jade +++ b/public/docs/js/latest/quickstart.jade @@ -119,13 +119,9 @@ 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 properties. The **`Class`** method is where we implement the component itself,