resolving svn conflicts

[infodrom/rico3] / ricoClient / css / striping / hot-sneaks.css

div.ricoLG_evenRow {  background-color: #ffffff; }\r
div.ricoLG_oddRow {  background-color: #93C3CD; }\r
.ricoLG_bottom div.ui-state-hover {\r
  border-left: none;\r
  border-top: none;\r
  border-right: none;\r
}\r