diff options
author | Jonathan Duran | 2012-06-19 08:40:26 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-19 08:40:26 -0700 |
commit | 6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39 (patch) | |
tree | 253e5f6dd5923218e3155f78fa67ff3e43de0ebc /js/mediators | |
parent | b51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/mediators')
-rwxr-xr-x | js/mediators/element-mediator.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js index 33377d72..bd0ae3cb 100755 --- a/js/mediators/element-mediator.js +++ b/js/mediators/element-mediator.js | |||
@@ -13,7 +13,6 @@ var ElementController = require("js/controllers/elements/element-controller").El | |||
13 | 13 | ||
14 | exports.ElementMediator = Montage.create(Component, { | 14 | exports.ElementMediator = Montage.create(Component, { |
15 | 15 | ||
16 | |||
17 | addDelegate: { | 16 | addDelegate: { |
18 | enumerable: false, | 17 | enumerable: false, |
19 | value: null | 18 | value: null |