fix for #2361

removed merge conflict comment in angular-mocks.js