diff options
| author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
| commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
| tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/document/templates/montage-html/package.json | |
| parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/document/templates/montage-html/package.json')
| -rwxr-xr-x | js/document/templates/montage-html/package.json | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/montage-html/package.json deleted file mode 100755 index d1e839dc..00000000 --- a/js/document/templates/montage-html/package.json +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | { | ||
| 2 | "directories": { | ||
| 3 | "lib": "" | ||
| 4 | }, | ||
| 5 | "mappings": { | ||
| 6 | "montage": "../../../../node_modules/montage/", | ||
| 7 | "montage-google": "../../../../node_modules/montage-google/" | ||
| 8 | } | ||
| 9 | } \ No newline at end of file | ||