iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(merge): fix a bad rebase merge left in the doc

This commit is contained in:
Naomi Black 2015-12-17 11:38:14 -08:00
parent 6cd469e7ee
commit f697e01b76
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/docs/js/latest/quickstart.jade
View File

@ -119,12 +119,8 @@ code-example(format="").
We're creating a visual component named **`AppComponent`** by chaining the 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`**. `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 ' + +makeExample('quickstart/js/app/app.component.js', 'ng-namespace-funcs', 'app/app.component.js ' +
'(Angular 2 methods)')(format=".") '(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 :marked
The **`Component`** method takes a configuration object with two The **`Component`** method takes a configuration object with two