Merge cleanup

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

2 files changed, 2 insertions, 4 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index bec033f8..10334b31 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -41,8 +41,7 @@
                         }
                     },
                     "dtext2" : {
-                        "module" : "montage/ui/dynamic-text.reel",
-                        "name" : "DynamicText",
+                        "prototype" : "montage/ui/dynamic-text.reel",
                         "properties" : {
                                 "element" : {"#" : "layer-tag"}
                         },
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index f821ba6f..f10e9ac9 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -119,8 +119,7 @@
                     },
 
                 "timelineZoomSlider":{
-                    "module":"js/components/slider.reel",
-                    "name":"Slider",
+                    "prototype":"js/components/slider.reel",
                     "properties":{
                         "element":{"#":"tl_slider"},
                         "maxValue" : 10000,