# Conflicts:
#	.gitignore
#	config.xml
#	package.json
#	src/app/app-routing.module.ts
#	src/app/app.component.ts
#	src/app/pages/dashboard/dashboard.page.html
#	src/app/pages/dashboard/dashboard.page.ts
#	src/app/pages/mainslider/mainslider.page.html
#	src/app/pages/mainslider/mainslider.page.scss
#	src/app/pages/mainslider/mainslider.page.ts
#	src/app/pages/menu/menu.module.ts
#	src/app/pages/menu/menu.page.html
#	src/app/pages/menu/menu.page.ts
#	src/app/pages/params/params.page.html
#	src/app/pages/partenaires-list/partenaires-list.page.ts
#	src/app/pages/start/start.page.ts
#	src/app/services/location-service.ts
#	src/app/services/trip-service.ts