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>

1 files changed, 0 insertions, 1 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 44ad9abb..5c5a8b76 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -15,7 +15,6 @@
                        "properties": {
                            "element": {"#": "track"},
                            "tweenRepetition" : {"@" : "tweenRepetition"},
-                           "styleTracksRepetition" : {"@" : "styleTracksRepetition"},
                            "tween": {"@" : "tween"},
                            "_mainCollapser" : {"@" : "mainCollapser"},
                            "_positionCollapser" : {"@" : "positionCollapser"},