--- ../../../all/themes/simply_modern/style.css	2009-06-23 13:03:38.000000000 -0500
+++ ./style.css	2009-10-26 16:45:15.000000000 -0500
@@ -1,6 +1,6 @@
 /* code for admin interface colors -- to be used if body text is a light color */
-<<<<<<< style.css
 /*$Id: style.css,v 1.11 2009/06/23 18:03:38 jrglasgow Exp $ */
+
 div.admin {
   padding:0;
 }
@@ -9,9 +9,6 @@ div.admin-panel h3 {
   background-color:#999 !important;
 }
 
-=======
-/*$Id: style.css,v 1.11 2009/06/23 18:03:38 jrglasgow Exp $ */
->>>>>>> 1.7
 tr.odd, tr.even,
 tr.odd a, tr.even a {
   color:black;