From 7b25ca5be39acd4c7e513a5cd168a69cbc43fd26 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michael@fsf.org>
Date: Thu, 20 Aug 2020 11:28:06 -0400
Subject: [PATCH] Fix rebase

---
 CRM/Core/Resources.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 00ca26b236..a0e3304517 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -363,10 +363,6 @@ class CRM_Core_Resources {
       $js = 'CRM.$.extend(true, CRM, ' . json_encode($this->getSettings()) . ');';
     }
     return sprintf("<script type=\"text/javascript\">\n// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3\n%s\n// @license-end\n</script>\n", $js);
-    */
-    $js = 'var CRM = ' . json_encode($this->getSettings()) . ';';
-    //return sprintf("<script type=\"text/javascript\">\n%s\n</script>\n", $js);
-    return sprintf("<script type=\"text/javascript\">\n// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3\n%s\n// @license-end\n</script>\n", $js);
   }
 
   /**
-- 
2.25.1