Merge pull request #5440 from giggio/fixGlobalModule

Remove global `module` definition from angular-mocks
This commit is contained in:
Masahiro Wakame
2015-08-28 12:04:37 +09:00
2 changed files with 9 additions and 8 deletions

View File

@@ -308,5 +308,6 @@ declare module angular {
///////////////////////////////////////////////////////////////////////////////
// functions attached to global object (window)
///////////////////////////////////////////////////////////////////////////////
declare var module: (...modules: any[]) => any;
//Use `angular.mock.module` instead of `module`, as `module` conflicts with commonjs.
//declare var module: (...modules: any[]) => any;
declare var inject: angular.IInjectStatic;