Permalink
Browse files

merge

  • Loading branch information...
1 parent f15e2a5 commit 0ef70f4456490943e37c3cc1268b363264e86b75 @dvv dvv committed Jul 22, 2010
Showing with 0 additions and 5 deletions.
  1. +0 −5 lib/receiver.js
View
@@ -1,12 +1,7 @@
-<<<<<<< HEAD:lib/loader.js
-/** A very lightweight implementation of transport/D's require.define and
- * require.ensure
-=======
/** A very lightweight implementation of transport/D's require.define and
* require.ensure. This can only receive modules, it will not proactively attempt to load
* any modules, so you must not turn off the default transporter setting of
* resolveDeps to use this module receiver.
->>>>>>> b4978ac0c691f957c2d46eb18aecc84ae5351cc8:lib/receiver.js
*/
(function(){
var factories = {},

0 comments on commit 0ef70f4

Please sign in to comment.