From 0b099806a7acab1ae62dadb1312605bb776d461b Mon Sep 17 00:00:00 2001 From: vitorsemeano Date: Thu, 28 Feb 2019 21:41:24 +0000 Subject: [PATCH] fix merge conflicts --- src/scripts/site.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/scripts/site.js b/src/scripts/site.js index 4752d59235..3f40ae07df 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -54,9 +54,6 @@ function pageIdOn(eventName, id, fn) { } var Dashboard = { - allowPluginPages: function (pluginId) { - return true; - }, getCurrentUser: function () { return window.ApiClient.getCurrentUser(false); },