fix conflicts

This commit is contained in:
Ibby Hadeed
2016-07-18 00:06:07 -04:00
70 changed files with 1747 additions and 1650 deletions
+3 -2
View File
@@ -1,5 +1,6 @@
import {Plugin, Cordova} from './plugin';
import {Observable} from 'rxjs/Observable';
import { Cordova, Plugin } from './plugin';
import { Observable } from 'rxjs/Observable';
declare var navigator: any;