updated output files

rudderlabs · Feb 17, 2020 · 11e6a51 · 11e6a51
1 parent fbf0d65
commit 11e6a51
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/dist/browser.js b/dist/browser.js
@@ -344,11 +344,15 @@ var rudderanalytics = (function (exports) {
   }; //Enumeration for integrations supported
   var BASE_URL = "http://localhost:8080/"; //"https://rudderlabs.com";
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   var CONFIG_URL = "http://localhost:5000/sourceConfig"; //"https://api.rudderlabs.com/workspaceConfig";
 =======
   var CONFIG_URL = "http://localhost:5000/sourceConfig"; //"https://api.rudderlabs.com/sourceConfig";//"https://api.rudderlabs.com/workspaceConfig";
 >>>>>>> added output files
+=======
+  var CONFIG_URL = "https://api.rudderlabs.com/sourceConfig"; //"https://api.rudderlabs.com/workspaceConfig";
+>>>>>>> updated output files
   var MAX_WAIT_FOR_INTEGRATION_LOAD = 10000;
   var INTEGRATION_LOAD_CHECK_INTERVAL = 1000;
   /* module.exports = {