Merge branch 'refs/heads/timeline-kruti-local' into TimelineUber

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

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 55c7162d..39d1ffc6 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -837,7 +837,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     var myIndex = this.layerRepetition.selectedIndexes[0];
                     this.arrLayers.splice(myIndex, 1);
                     var selectIndex = this.arrLayers.length;
-                    this.searchHighestTrackDuration();
+                    this.resetMasterDuration();
                     if(selectIndex>0){
                         this.selectLayer(selectIndex-1);
                     }
@@ -847,8 +847,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    searchHighestTrackDuration:{
-        value:function () {
+    resetMasterDuration:{
+        value:function(){
 
             var trackDuration;
             var length = this.arrLayers.length;