diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ngMock/angular-mocks.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js index cdc43cdd..2aadf1dc 100644 --- a/src/ngMock/angular-mocks.js +++ b/src/ngMock/angular-mocks.js @@ -1687,12 +1687,8 @@ window.jasmine && (function(window) { * @name angular.mock.inject * @description * -<<<<<<< HEAD - * *NOTE*: This is function is also published on window for easy access.<br> - * *NOTE*: Only available with {@link http://pivotal.github.com/jasmine/ jasmine}. -======= * *NOTE*: This function is also published on window for easy access.<br> ->>>>>>> 8dca056... docs(mocks): fix typos + * *NOTE*: Only available with {@link http://pivotal.github.com/jasmine/ jasmine}. * * The inject function wraps a function into an injectable function. The inject() creates new * instance of {@link AUTO.$injector $injector} per test, which is then used for |