fix(sublime-adapter): fixes to submit sublimePrebidAdapter

prebid · Jul 16, 2019 · 0c541cd · 0c541cd
1 parent a2c0589
commit 0c541cd
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/test/spec/modules/sublimeBidAdapter_spec.js b/test/spec/modules/sublimeBidAdapter_spec.js
@@ -111,11 +111,7 @@ describe('Sublime Adapter', function() {
       expect(request.url).to.equal('https://pbjs.sskzlabs.com/bid');
     });
 
-<<<<<<< HEAD
     it('should create a default callback function', function() {
-=======
-    it('should create a default callback function', () => {
->>>>>>> Fix tests for sublimeBidAdapter
       expect(window['sublime_prebid_callback_23651']).to.be.an('function');
     });
   });