diff options
| author | Nivesh Rajbhandari | 2012-05-04 14:54:35 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-04 14:54:35 -0700 |
| commit | ce2d581894f9e433a7b73e4b622352a657b6ddaa (patch) | |
| tree | bbd4eb9f6d00ee9d3c0bcc53ce560cfc1e71127b /js/document/models/html.js | |
| parent | 8f8f7f9a36fb9abadea2a9f25aef0084946bebc9 (diff) | |
| parent | 8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff) | |
| download | ninja-ce2d581894f9e433a7b73e4b622352a657b6ddaa.tar.gz | |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Conflicts:
js/document/templates/montage-web/default_html.css
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/document/models/html.js')
| -rwxr-xr-x | js/document/models/html.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/document/models/html.js b/js/document/models/html.js index ff57454b..f45a0e21 100755 --- a/js/document/models/html.js +++ b/js/document/models/html.js | |||
| @@ -14,7 +14,6 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, { | |||
| 14 | //////////////////////////////////////////////////////////////////// | 14 | //////////////////////////////////////////////////////////////////// |
| 15 | // | 15 | // |
| 16 | hasTemplate: { | 16 | hasTemplate: { |
| 17 | enumerable: false, | ||
| 18 | value: false | 17 | value: false |
| 19 | } | 18 | } |
| 20 | //////////////////////////////////////////////////////////////////// | 19 | //////////////////////////////////////////////////////////////////// |