Fix bad merge.

c85cc5a3 · cahrens · d72b6b05 · c85cc5a3
Commit c85cc5a3 authored May 15, 2013 by cahrens
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

cms/static/sass/views/_static-pages.scss
+2 -1

No files found.
--- 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;
  }
 }
+