diff options
| author | John Mayhew | 2012-02-10 16:04:19 -0800 |
|---|---|---|
| committer | John Mayhew | 2012-02-10 16:04:19 -0800 |
| commit | 730c1e191e36b8ab8dba576c481a6585e0dfa69e (patch) | |
| tree | c86445ff8d1981e97096ec5e9f6cc5301dc9ea40 /js/components/package.json | |
| parent | cde1dd9a9156b9682fdf85ce2cd4acdd94124c37 (diff) | |
| parent | 48977780443d97b9e97b047066639c9056788041 (diff) | |
| download | ninja-730c1e191e36b8ab8dba576c481a6585e0dfa69e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/ninja.reel/ninja.html
Diffstat (limited to 'js/components/package.json')
| -rw-r--r-- | js/components/package.json | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/js/components/package.json b/js/components/package.json deleted file mode 100644 index f3a6f0e0..00000000 --- a/js/components/package.json +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | { | ||
| 2 | "directories": { | ||
| 3 | "lib": "../../" | ||
| 4 | }, | ||
| 5 | "mappings": { | ||
| 6 | "montage": "../../node_modules/montage/" | ||
| 7 | } | ||
| 8 | } \ No newline at end of file | ||