Conflicts: src/app/app.js src/app/controllers/all.js src/app/routes/all.js src/app/services/datasourceSrv.js src/test/test-main.js
