From 383739183d7352e0e691e53f974788f9dafc529b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 25 Mar 2014 15:01:45 -0400
Subject: [PATCH] CRM-14383 - Add CRM.$ and CRM._ noconflict objects

---
 js/noconflict.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/noconflict.js b/js/noconflict.js
index 7284269128..d52906a31e 100644
--- a/js/noconflict.js
+++ b/js/noconflict.js
@@ -1 +1,3 @@
-var cj = jQuery.noConflict(true);
+window.CRM || (window.CRM = {});
+window.cj = CRM.$ = jQuery.noConflict(true);
+CRM._ = _.noConflict();
-- 
2.25.1