From c85cc5a3a763555eee3c1cb8f69c4a5d6e166a64 Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Wed, 15 May 2013 15:35:18 -0400
Subject: [PATCH] Fix bad merge.

---
 cms/static/sass/views/_static-pages.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cms/static/sass/views/_static-pages.scss b/cms/static/sass/views/_static-pages.scss
index a28e991f46..a00e1405bf 100644
--- a/cms/static/sass/views/_static-pages.scss
+++ b/cms/static/sass/views/_static-pages.scss
@@ -37,7 +37,7 @@ body.course.static-pages {
       //Overrides general edit-box mixin 
       .row {
         margin-bottom: 0px;
-
+      }
 
       // This duplicates the styling from Unit page editing
       .module-actions {
@@ -190,3 +190,4 @@ body.course.static-pages {
     outline: 0;
   }
 }
+