Merge branch 'master' of https://github.com/start-angular/sb-admin-angular

sankhadeep · sankhadeep · commit 8e6e73936f3d · 2015-05-15T16:06:50.000+05:30
diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -59,7 +59,7 @@ angular
                 $ocLazyLoad.load(
                 {
                   name:'ngResource',
-                  files:['bower_components/angular-animate/angular-animate.js']
+                  files:['bower_components/angular-resource/angular-resource.js']
                 })
                 $ocLazyLoad.load(
                 {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ angular`
`59`	`59`	`$ocLazyLoad.load(`
`60`	`60`	`{`
`61`	`61`	`name:'ngResource',`
`62`		`- files:['bower_components/angular-animate/angular-animate.js']`
	`62`	`+ files:['bower_components/angular-resource/angular-resource.js']`
`63`	`63`	`})`
`64`	`64`	`$ocLazyLoad.load(`
`65`	`65`	`{`