Merge remote-tracking branch 'ninja-internal/master' into test-merge

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

1 files changed, 3 insertions, 3 deletions

diff --git a/js/panels/css-panel/style-declaration.reel/style-declaration.html b/js/panels/css-panel/style-declaration.reel/style-declaration.html
index fad54453..4cdf0741 100644
--- a/js/panels/css-panel/style-declaration.reel/style-declaration.html
+++ b/js/panels/css-panel/style-declaration.reel/style-declaration.html
@@ -43,9 +43,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 },
                 "bindings": {
                     "source": {"<-": "@repetition.objectAtCurrentIteration" },
-                    "propertyText": {"<<->": "@repetition.objectAtCurrentIteration.name" },
-                    "valueText": {"<<->": "@repetition.objectAtCurrentIteration.value" },
-                    "empty": {"<<->": "@repetition.objectAtCurrentIteration.isEmpty" },
+                    "propertyText": {"<->": "@repetition.objectAtCurrentIteration.name" },
+                    "valueText": {"<->": "@repetition.objectAtCurrentIteration.value" },
+                    "empty": {"<->": "@repetition.objectAtCurrentIteration.isEmpty" },
                     "delegate": {"<-": "@owner.focusDelegate" }
                 }
             }