Update angular-mocks.js

Removing previously unresolved (but harmless) merge conflict