Fix broken commit

[roojs1] / css / daypicker.css

diff --git a/css/daypicker.css b/css/daypicker.css
index b4631de..52bdde7 100644 (file)
--- a/css/daypicker.css
+++ b/css/daypicker.css
@@ -1,21 +1,31 @@
 
 
 
+<<<<<<< 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;
@@ -23,12 +33,15 @@
     margin: 0;
     margin-left: 5px;
 <<<<<<< HEAD
+<<<<<<< HEAD
     
 }
 .x-form-daypick-icons td img.x-menu-item-checked {
     background-position: 0 -16px;
 }
 =======
+=======
+>>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211
     cursor: pointer;
     
 }
@@ -37,4 +50,7 @@
 {
     background-position: 0 -16px;
 }
+<<<<<<< HEAD
+>>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211
+=======
 >>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211