diff options
| author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
| commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
| tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /js/document/templates/banner/package.json | |
| parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
| parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
| download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/document/templates/banner/package.json')
| -rwxr-xr-x | js/document/templates/banner/package.json | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/js/document/templates/banner/package.json b/js/document/templates/banner/package.json deleted file mode 100755 index d1e839dc..00000000 --- a/js/document/templates/banner/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 | ||