From 63fd5b57dddd500be39caa09af480ad44029e77c Mon Sep 17 00:00:00 2001
From: Matthew Mongeau <halogenandtoast@gmail.com>
Date: Wed, 18 Jul 2012 10:23:44 -0400
Subject: [PATCH] Fix _modal.scss merge conflicts.

---
 lms/static/sass/shared/_modal.scss | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lms/static/sass/shared/_modal.scss b/lms/static/sass/shared/_modal.scss
index d95902d895..1ac3bbcbb2 100644
--- 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 {