Fix _modal.scss merge conflicts.

63fd5b57 · Matthew Mongeau · 9bf4b11a · 63fd5b57
Commit 63fd5b57 authored Jul 18, 2012 by Matthew Mongeau
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 5 deletions

lms/static/sass/shared/_modal.scss
+1 -5

No files found.
--- a/lms/static/sass/shared/_modal.scss
+++ b/lms/static/sass/shared/_modal.scss
@@ -115,10 +115,7 @@
      padding: 12px;
    }

-<<<<<<< HEAD
-    .activation-message, .message {
-=======
-    .notice {
+    .activation-message, .message, .notice {
      background: $yellow;
      border: 1px solid darken($yellow, 60%);
      color: darken($yellow, 60%);
@@ -128,7 +125,6 @@
    }

    .activation-message {
->>>>>>> cb49d9c... Style notice.
      padding: 0 40px 10px;

      p {