javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-23 05:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(merge): fix merge conflicts

Browse Source
This commit is contained in:
Brandy Carney
2016-10-12 13:43:34 -04:00
parent fd5cdf0597 41ab767868
commit 74adf99adb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/nav/nav.ts
View File

@ -15,10 +15,10 @@ import { ViewController } from '../../navigation/view-controller';
* @name Nav
* @description
*
* `ion-nav` is the declarative component for a [NavController](/docs/v2/api/navigation/NavController/).
* `ion-nav` is the declarative component for a [NavController](../../../navigation/NavController/).
*
* For more information on using nav controllers like Nav or [Tab](/docs/v2/api/components/tabs/Tabs/),
* take a look at the [NavController API Docs](/docs/v2/api/navigation/NavController/).
* For more information on using nav controllers like Nav or [Tab](../../Tabs/Tab/),
* take a look at the [NavController API Docs](../../../navigation/NavController/).
*
*
* @usage