From 54c91c3d9e5080259ef69bbfa95cdbcc81faa488 Mon Sep 17 00:00:00 2001
From: nelo <nelo@verdnatura.es>
Date: Fri, 7 Oct 2016 12:10:24 +0200
Subject: [PATCH] Arreglo merge

---
 @salix/app/src/routes.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/@salix/app/src/routes.js b/@salix/app/src/routes.js
index fd5750bd7..2fc5204f1 100644
--- a/@salix/app/src/routes.js
+++ b/@salix/app/src/routes.js
@@ -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
+
             });
         });
     }