verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Arreglo merge

This commit is contained in:
nelo 2016-10-07 12:10:24 +02:00
parent e4808007b7
commit 54c91c3d9e
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
@salix/app/src/routes.js
View File

@ -1,14 +1,5 @@
import * as core from '@salix/core';
import * as spliting from './spliting';
<<<<<<< HEAD
function config($stateProvider, $urlRouterProvider) {
function loader($ocLazyLoad, $q) {
return $q(resolve => {
spliting.crud(() => {
resolve($ocLazyLoad.load({name: 'crud'}));
=======
import * as routes from './fake';
core.module.config(function ($stateProvider, $urlRouterProvider) {
core.splitingRegister.registerGraph(routes.graphRoutes.graphDependendies);
@ -20,7 +11,7 @@ core.module.config(function ($stateProvider, $urlRouterProvider) {
var array = dependencies.map((item) => { return { name: item } });
resolve($ocLazyLoad.load(array));
});
>>>>>>> 0bfbc5e0642bb669d8568ea1ce1782fde1702aa6
});
});
}