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

1 files changed, 2 insertions, 2 deletions

diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js
index 59cd13ed..91ce1cfb 100644
--- a/js/panels/Timeline/Span.reel/Span.js
+++ b/js/panels/Timeline/Span.reel/Span.js
@@ -59,7 +59,7 @@ var Span = exports.Span = Montage.create(Component, {
     },
     
     _easing: {
-        value: "ease-in"
+        value: "none"
     },
     easing: {
         get: function() {
@@ -68,7 +68,7 @@ var Span = exports.Span = Montage.create(Component, {
         set: function(newVal) {
                 if (newVal !== this._easing) {
                         if (typeof(newVal) === "undefined") {
-                                newVal = "ease-in";
+                                newVal = "none";
                         }
                         this._easing = newVal;
                         this.parentComponent.setKeyframeEase(newVal);