resolve merge conflicts

1 files changed, 0 insertions, 16 deletions

diff --git a/static/email.js b/static/email.js
deleted file mode 100644
index 01e338a..0000000
--- a/static/email.js
+++ /dev/null
@@ -1,16 +0,0 @@
-(function() {
-    // Find all the elements on the page that use class="m-protected"
-    var allElements = document.getElementsByClassName('m-protected');
-
-    // Loop through all the elements, and update them
-    for (var i = 0; i < allElements.length; i++) {
-        // fetch the hex-encoded string from the href property
-        var encoded = allElements[i].getAttribute('href');
-
-        // decode the email address
-        var decoded = atob(encoded.substring(1));
-
-        // Set the link to be a "mailto:" link
-        allElements[i].href = 'mailto:' + decoded;
-    }
-})();