Fix broken commit

diff --git a/Roo/form/DayPicker.js b/Roo/form/DayPicker.js
index c97c27f..ecaaec1 100644 (file)
--- a/Roo/form/DayPicker.js
+++ b/Roo/form/DayPicker.js
@@ -75,8 +75,12 @@ Roo.extend(Roo.form.DayPicker, Roo.form.Field,  {
        
         this.wrap = this.el.wrap({cls: 'x-form-daypick-item '});
         
+<<<<<<< HEAD
 <<<<<<< HEAD
         var r1 = '<table><tr>'
+=======
+        var r1 = '<table><tr>';
+>>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211
 =======
         var r1 = '<table><tr>';
 >>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211
@@ -147,6 +151,7 @@ Roo.extend(Roo.form.DayPicker, Roo.form.Field,  {
         if (suppressEvent) {
             return ;
         }
+<<<<<<< HEAD
 <<<<<<< HEAD
         var cur = {};
         for (var i =0; i < v.length;i++) {
@@ -154,13 +159,20 @@ Roo.extend(Roo.form.DayPicker, Roo.form.Field,  {
         }
 =======
          
+>>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211
+=======
+         
 >>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211
         // update display..
         this.viewEl.select('img',true).each(function(e,i,n)  {
             
             var on = e.is(".x-menu-item-checked");
+<<<<<<< HEAD
 <<<<<<< HEAD
             var newv = typeof(cur[n]) != 'undefined';
+=======
+            var newv = v.indexOf(String(n)) > -1;
+>>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211
 =======
             var newv = v.indexOf(String(n)) > -1;
 >>>>>>> bb63e2e529c47fb77152cfc02100d5ff9fdca211

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