Fix _modal.scss merge conflicts.

2012-07-18 10:23:44 -04:00
parent 9bf4b11ae9
commit 63fd5b57dd
1 changed files with 1 additions and 5 deletions
--- 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 {