Index: bin/merge-files |
=== modified file 'bin/merge-files' |
--- bin/merge-files 2012-12-20 21:59:21 +0000 |
+++ bin/merge-files 2013-01-04 13:48:14 +0000 |
@@ -48,8 +48,6 @@ |
// templates.js is a generated file. It is not part of the app directory. |
paths.push(syspath.join(process.cwd(), 'build-shared/juju-ui/templates.js')); |
- // XXX Why do we have to do this? (bug 1090563). |
- paths.push(syspath.join(process.cwd(), 'app/models/charm.js')); |
merge.combineJs(paths, 'build-shared/juju-ui/assets/app.js'); |