Fix rebase

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index c084c3cdc46694571dfbb47ec5dd56bf2094d86b..73d0109be747446f5c19d6fab5f7b05993c4382e 100644 (file)
--- 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);
   }
 
   /**