From 0221288738afd5310ab7659fb951c1d7fb9b93b8 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Thu, 5 Apr 2012 10:46:45 -0700 Subject: Undoing some minor spacing differences from auto-merge. Signed-off-by: Nivesh Rajbhandari --- js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 2 +- js/panels/presets/transitions-presets.reel/transitions-presets.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css index ca6fe6fd..067285ae 100644 --- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css +++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css @@ -15,7 +15,7 @@ -webkit-box-orient: horizontal; height : 100%; position: relative; - margin-top: 1px; + margin-top:1px; } .leftinside{ height: 100%; diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.js b/js/panels/presets/transitions-presets.reel/transitions-presets.js index 24fab684..4ca2a662 100644 --- a/js/panels/presets/transitions-presets.reel/transitions-presets.js +++ b/js/panels/presets/transitions-presets.reel/transitions-presets.js @@ -23,6 +23,6 @@ exports.TransitionsLibrary = Montage.create(Component, { handleNodeActivation: { value: function(presetData) { this.application.ninja.presetsController.applyPreset(presetData); - } - } + } + } }); -- cgit v1.2.3