[incubator-flagon-useralejs] branch master updated: adding updated builds

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

poorejc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-flagon-useralejs.git


The following commit(s) were added to refs/heads/master by this push:
     new 018d193  adding updated builds
018d193 is described below

commit 018d193e2a0acb748638eeebde963b00d7ec866d
Author: poorejc <po...@apache.org>
AuthorDate: Fri Sep 27 02:28:44 2019 -0400

    adding updated builds
---
 build/UserAleWebExtension/content.js | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/build/UserAleWebExtension/content.js b/build/UserAleWebExtension/content.js
index 345486f..ae2be33 100644
--- a/build/UserAleWebExtension/content.js
+++ b/build/UserAleWebExtension/content.js
@@ -156,20 +156,6 @@ function timeStampScale(e) {
   return tsScaler;
 }
 
-<<<<<<< HEAD
-/**
- * Updates the current configuration
- * object with the provided values.
- * @param  {Object} newConfig The configuration options to use.
- * @return {Object}           Returns the updated configuration.
- */
-function options(newConfig) {
-  if (newConfig !== undefined) {
-    configure(config$1, newConfig);
-  }
-
-  return config$1;
-=======
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -485,7 +471,6 @@ function selectorizePath(path) {
     ++i;
   }
   return pathSelectors;
->>>>>>> FLAGON-434
 }
 
 /*
@@ -734,17 +719,6 @@ function attachHandlers(config) {
   return true;
 }
 
-<<<<<<< HEAD
-function injectScript(config) {
-  options(config);
-//  start();  not necessary given that autostart in place, and option is masked from WebExt users
-  setLogFilter(function (log) {
-    queueLog(Object.assign({}, log, {
-      pageUrl: document.location.href,
-    }));
-    return false;
-  });
-=======
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -810,7 +784,6 @@ function options(newConfig) {
   }
 
   return config$1;
->>>>>>> FLAGON-434
 }
 
 /*