Delete jasmine-test_NY375ML-2QMFFT1_Jan-03-0951-2014_Conflict.js

this is a generated file and shouldn't be in the repository