Posted by jonathan_hunt on May 13, 2009 at 3:32am
| Project: | Simply Modern Theme |
| Version: | 6.x-1.4 |
| Component: | Code |
| Category: | bug report |
| Priority: | normal |
| Assigned: | Unassigned |
| Status: | closed (won't fix) |
Issue Summary
I noticed style.css contains conflict tokens from CVS, svn or whatever...
/* code for admin interface colors -- to be used if body text is a light color */
<<<<<<< style.css
/*$Id: style.css,v 1.10 2009/04/22 17:33:49 jrglasgow Exp $ */
div.admin {
padding:0;
}
div.admin-panel h3 {
background-color:#999 !important;
}
=======
/*$Id: style.css,v 1.10 2009/04/22 17:33:49 jrglasgow Exp $ */
>>>>>>> 1.7
tr.odd, tr.even,
tr.odd a, tr.even a {
color:black;
}
Comments
#1
simple patch removing conflict markers and extra Id line
#2