javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): fix conflicts

Browse Source 
# Conflicts:
#	src/config/bootstrap.ts
This commit is contained in:
Adam Bradley
2016-05-31 18:13:33 -05:00
parent 9cc127dc1c 3b02ffbcdc
commit f14e2dc04b
17 changed files with 1608 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/directives.ts
View File

@@ -34,6 +34,7 @@ import {Label} from '../components/label/label';
import {Segment, SegmentButton} from '../components/segment/segment';
import {RadioButton} from '../components/radio/radio-button';
import {RadioGroup} from '../components/radio/radio-group';
import {Range} from '../components/range/range';
import {Searchbar, SearchbarInput} from '../components/searchbar/searchbar';
import {Nav} from '../components/nav/nav';
import {NavPush, NavPop} from '../components/nav/nav-push';
@@ -165,6 +166,7 @@ export const IONIC_DIRECTIVES: any[] = [
Checkbox,
RadioGroup,
RadioButton,
Range,
Select,
Option,
DateTime,