django-debug-toolbar/django-debug-toolbar — pull request #590 by mbarrien (2014-04-28 22:34:39+00:00)
Title: Re-fix #535 fix reversed noConflict in DjDT jQuery include

Per my comment at https://github.com/django-debug-toolbar/django-debug-toolbar/commit/727b4e05f59c15904f7b08388220b7bfc76d59b2#diff-4f4a91c0e3639b7eb74d3dc23799f72dR8

I believe the noConflict call is swapped; using your own JQUERY_URL should *not* use noConflict, while using the "bundled" one of DjDT *should* use noConflict. The code as currently written does the reverse, and both break in my app that uses both require.js and other jQuery plugins, with the jQuery plugins unable to find the jQuery "$" object.

This pull request reverses those, fixing that.

If this pull request is accepted, an expedited 1.2.1 release would be appreciated! Thanks!