~juju-gui/juju-gui/trunk

Viewing all changes in revision 303.

  • Committer: Francesco Banconi
  • Date: 2013-01-04 15:57:57 UTC
  • mfrom: (300.1.2 bug-1090563-merge-files)
  • Revision ID: francesco.banconi@canonical.com-20130104155757-tm7lt1tfttrcnpxu
Removed no longer needed workaround.

The file app/models/charm.js was added explicitly 
in bin/merge-files. Apparently this workaround
is no longer required: the file is correctly
collected by lib/merge-files.js:readdir.

R=gary.poster, teknico
CC=
https://codereview.appspot.com/7033053

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: