ENG-4157

freestarcapital · May 27, 2020 · ffd327b · ffd327b
1 parent 3e10cd6
commit ffd327b
Show file tree

Hide file tree

Showing 2 changed files with 3,430 additions and 3,453 deletions.
diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
@@ -44,12 +44,8 @@ const storage = getStorageManager(GVLID, BIDDER_CODE);
 
 export const spec = {
   code: BIDDER_CODE,
-<<<<<<< HEAD
-  aliases: ['appnexusAst', 'brealtime', 'emxdigital', 'pagescience', 'defymedia', 'gourmetads', 'matomy', 'featureforward', 'districtm', 'adasta'], // @NOTE we must remove oftmedia here if there is ever a conflict
-=======
   gvlid: GVLID,
-  aliases: ['appnexusAst', 'brealtime', 'emxdigital', 'pagescience', 'defymedia', 'gourmetads', 'matomy', 'featureforward', 'oftmedia', 'districtm', 'adasta', 'beintoo'],
->>>>>>> 3.20.0
+  aliases: ['appnexusAst', 'brealtime', 'emxdigital', 'pagescience', 'defymedia', 'gourmetads', 'matomy', 'featureforward', 'districtm', 'adasta', 'beintoo'], // @NOTE we must remove oftmedia here if there is ever a conflict
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   /**