diff options
| author | Kruti Shah | 2012-06-27 12:41:35 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-27 12:41:35 -0700 |
| commit | 37fd59d6574b4230df5ff8022e300d8d310c380d (patch) | |
| tree | a92e3c27e7fd6c9db942d99c3d91035a8230cdea /js/ninja.reel/ninja.js | |
| parent | f57b0fe3640dbb4aa2e355d165225bc267c134c2 (diff) | |
| parent | 8351c3685a6db703d1940817abc71f92ef4e1bd4 (diff) | |
| download | ninja-37fd59d6574b4230df5ff8022e300d8d310c380d.tar.gz | |
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Diffstat (limited to 'js/ninja.reel/ninja.js')
| -rwxr-xr-x | js/ninja.reel/ninja.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index f1825b9a..859268a0 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
| @@ -137,7 +137,7 @@ exports.Ninja = Montage.create(Component, { | |||
| 137 | serializable: true | 137 | serializable: true |
| 138 | }, | 138 | }, |
| 139 | 139 | ||
| 140 | codeEditorController: { | 140 | codeEditorWrapper: { |
| 141 | value: null, | 141 | value: null, |
| 142 | serializable: true | 142 | serializable: true |
| 143 | }, | 143 | }, |