diff options
| author | Takashi Matsuo | 2013-04-04 22:01:35 -0700 |
|---|---|---|
| committer | James deBoer | 2013-04-11 10:28:10 -0700 |
| commit | b2b015a53b8e3a548bb76be862e9d59783fb268f (patch) | |
| tree | 35d7962bf228a18939361688fa4766bb5f496f76 | |
| parent | 5bea4c5692b82a5af62e7e80bf2f0c5f51d3106c (diff) | |
| download | angular.js-b2b015a53b8e3a548bb76be862e9d59783fb268f.tar.bz2 | |
chore(docs): Fixed incomplete merge
| -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 |