diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /node_modules/montage/examples/feed-reader/package.json | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/examples/feed-reader/package.json')
| -rw-r--r-- | node_modules/montage/examples/feed-reader/package.json | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/node_modules/montage/examples/feed-reader/package.json b/node_modules/montage/examples/feed-reader/package.json deleted file mode 100644 index cbb9365f..00000000 --- a/node_modules/montage/examples/feed-reader/package.json +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | { | ||
| 2 | "name": "loader", | ||
| 3 | "version": "0.0.0", | ||
| 4 | "mappings": { | ||
| 5 | "montage": "../.." | ||
| 6 | }, | ||
| 7 | "directories": { | ||
| 8 | "lib": "" | ||
| 9 | } | ||
| 10 | } | ||