Permalink
Browse files

Merge conflict.

  • Loading branch information...
2 parents c0d9cc7 + 62a5517 commit 1f9bb4fda3a27d5948851cb21143f17ca9877655 @mikeal committed Oct 31, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 registry/app.js
View
@@ -10,4 +10,4 @@ var ddoc = module.exports =
}
var modules = require("./modules.js")
-for (var i in modules) ddoc[i] = modules[i]
+for (var i in modules) ddoc[i] = modules[i]

0 comments on commit 1f9bb4f

Please sign in to comment.