Permalink
Browse files

Fix merge

  • Loading branch information...
1 parent fb3bb98 commit 58af7e0662b40faf3a6cf7707c5163aa2904278a @jrburke jrburke committed Dec 14, 2012
Showing with 3 additions and 0 deletions.
  1. +3 −0 backbone.js
View
@@ -39,6 +39,9 @@
// Current version of the library. Keep in sync with `package.json`.
Backbone.VERSION = '0.9.9';
+ // For Backbone's purposes, jQuery, Zepto, or Ender owns the `$` variable.
+ Backbone.$ = $;
+
// Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
// to its previous owner. Returns a reference to this Backbone object.
Backbone.noConflict = function() {

0 comments on commit 58af7e0

Please sign in to comment.