diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /node_modules/montage/examples/youtube-channel-example/package.json | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'node_modules/montage/examples/youtube-channel-example/package.json')
| -rwxr-xr-x | node_modules/montage/examples/youtube-channel-example/package.json | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/node_modules/montage/examples/youtube-channel-example/package.json b/node_modules/montage/examples/youtube-channel-example/package.json deleted file mode 100755 index ecfbdd8a..00000000 --- a/node_modules/montage/examples/youtube-channel-example/package.json +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | { | ||
| 2 | "name": "youtube-channel-example", | ||
| 3 | "version": "0.0.0", | ||
| 4 | "mappings": { | ||
| 5 | "montage": "../../" | ||
| 6 | } | ||
| 7 | } \ No newline at end of file | ||