Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-09 23:34:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(docs): Fixed incomplete merge

Browse source
This commit is contained in:
Takashi Matsuo 2013-04-04 22:01:35 -07:00 committed by James deBoer
parent 5bea4c5692
commit b2b015a53b
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ngMock/angular-mocks.js vendored
View file

@ -1687,12 +1687,8 @@ window.jasmine && (function(window) {
* @name angular.mock.inject * @name angular.mock.inject
* @description * @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> * *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 * 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 * instance of {@link AUTO.$injector $injector} per test, which is then used for