Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(3483)

Unified Diff: bin/merge-files

Issue 7033053: Removed no longer needed workaround.
Patch Set: Removed no longer needed workaround. Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « [revision details] ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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');
« no previous file with comments | « [revision details] ('k') | no next file » | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b