aboutsummaryrefslogtreecommitdiff
path: root/js/document/templates
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-10 15:27:40 -0700
committerJohn Mayhew2012-05-10 15:27:40 -0700
commitd5995fd5dfcc0cb0cb2361b1099911fa4fc51189 (patch)
tree3a683ac5ddcb3fc7fa4111e7769c15abb31c1ec4 /js/document/templates
parentba64dfa1d64969e290f15459a826171468fe3550 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-d5995fd5dfcc0cb0cb2361b1099911fa4fc51189.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Diffstat (limited to 'js/document/templates')
-rwxr-xr-xjs/document/templates/montage-html/package.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/montage-html/package.json
index c8bc02fb..d1e839dc 100755
--- a/js/document/templates/montage-html/package.json
+++ b/js/document/templates/montage-html/package.json
@@ -3,6 +3,7 @@
3 "lib": "" 3 "lib": ""
4 }, 4 },
5 "mappings": { 5 "mappings": {
6 "montage": "../../../../node_modules/montage/" 6 "montage": "../../../../node_modules/montage/",
7 "montage-google": "../../../../node_modules/montage-google/"
7 } 8 }
8} \ No newline at end of file 9} \ No newline at end of file