Fix merge errors

[roojs1] / css / daypicker.css

diff --git a/css/daypicker.css b/css/daypicker.css
index 52bdde7..5b3738e 100644 (file)
--- a/css/daypicker.css
+++ b/css/daypicker.css
@@ -1,47 +1,19 @@
 
 
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-.x-form-daypick-item td div {
-=======
 .x-form-daypick-item td div
 {
->>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211
-=======
-.x-form-daypick-item td div
-{
->>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211
     width: 30px;
     text-align: center;
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-.x-form-daypick-icons td img {
-=======
-.x-form-daypick-icons td img
-{
->>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211
-=======
 .x-form-daypick-icons td img
 {
->>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211
     background: url(../images/default/menu/chk-sprite.gif) no-repeat 0 0;
     width: 16px;
     height: 16px;
     margin: 0;
     margin-left: 5px;
-<<<<<<< HEAD
-<<<<<<< HEAD
-    
-}
-.x-form-daypick-icons td img.x-menu-item-checked {
-    background-position: 0 -16px;
-}
-=======
-=======
->>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211
     cursor: pointer;
     
 }
@@ -50,7 +22,3 @@
 {
     background-position: 0 -16px;
 }
-<<<<<<< HEAD
->>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211
-=======
->>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211