Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/jclain/jquery into jclain…

…-master
  • Loading branch information...
jeresig committed Apr 12, 2011
2 parents f1d75ed + 596f9a1 commit 122514a8da8f214dc3e7b7b17defdbff862e8748
Showing with 4 additions and 2 deletions.
  1. +4 −2 src/core.js
@@ -358,9 +358,11 @@ jQuery.extend = jQuery.fn.extend = function() {

jQuery.extend({
noConflict: function( deep ) {
window.$ = _$;
if ( window.$ === jQuery ) {
window.$ = _$;
}

if ( deep ) {
if ( deep && window.jQuery === jQuery ) {
window.jQuery = _jQuery;
}

0 comments on commit 122514a

Please sign in to comment.
You can’t perform that action at this time.