latest changes
Showing
... | @@ -24,15 +24,9 @@ | ... | @@ -24,15 +24,9 @@ |
"@angular/platform-browser-dynamic": "~8.1.2", | "@angular/platform-browser-dynamic": "~8.1.2", | ||
"@angular/router": "~8.1.2", | "@angular/router": "~8.1.2", | ||
"@ionic-native/core": "^5.0.0", | "@ionic-native/core": "^5.0.0", | ||
<<<<<<< HEAD | |||
"@ionic-native/geolocation": "^5.15.1", | "@ionic-native/geolocation": "^5.15.1", | ||
"@ionic-native/google-plus": "^5.0.0-beta.0", | "@ionic-native/google-plus": "^5.0.0-beta.0", | ||
"@ionic-native/native-geocoder": "^5.15.1", | "@ionic-native/native-geocoder": "^5.15.1", | ||
======= | |||
"@ionic-native/geolocation": "^5.0.0", | |||
"@ionic-native/google-plus": "^5.0.0-beta.0", | |||
"@ionic-native/native-geocoder": "^5.0.0", | |||
>>>>>>> master | |||
"@ionic-native/splash-screen": "^5.0.0", | "@ionic-native/splash-screen": "^5.0.0", | ||
"@ionic-native/status-bar": "^5.12.0", | "@ionic-native/status-bar": "^5.12.0", | ||
"@ionic/angular": "^4.7.1", | "@ionic/angular": "^4.7.1", | ||
... | @@ -52,10 +46,7 @@ | ... | @@ -52,10 +46,7 @@ |
"core-js": "^2.5.4", | "core-js": "^2.5.4", | ||
"firebase": "^6.4.0", | "firebase": "^6.4.0", | ||
"rxjs": "~6.5.1", | "rxjs": "~6.5.1", | ||
<<<<<<< HEAD | |||
"rxjs-compat": "^6.5.3", | "rxjs-compat": "^6.5.3", | ||
======= | |||
>>>>>>> master | |||
"tslib": "^1.9.0", | "tslib": "^1.9.0", | ||
"zone.js": "~0.9.1" | "zone.js": "~0.9.1" | ||
}, | }, | ||
... | @@ -109,8 +100,4 @@ | ... | @@ -109,8 +100,4 @@ |
"android" | "android" | ||
] | ] | ||
} | } | ||
<<<<<<< HEAD | |||
} | |||
======= | |||
} | } | ||
>>>>>>> master |
src/config/center.service.ts
0 → 100644
src/config/services/center.ts
0 → 100644
src/config/services/shopper.ts
0 → 100644
src/config/shopper.service.ts
0 → 100644
Please
register
or
sign in
to comment