Fix merge errors

diff --git a/Roo/form/DayPicker.js b/Roo/form/DayPicker.js
index ecaaec1..46f4e8d 100644 (file)
--- a/Roo/form/DayPicker.js
+++ b/Roo/form/DayPicker.js
@@ -75,15 +75,7 @@ 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
         var r2 = '<tr class="x-form-daypick-icons">';
         for (var i=0; i < 7; i++) {
             r1+= '<td><div>' + Date.dayNames[i].substring(0,3) + '</div></td>';
@@ -151,31 +143,12 @@ Roo.extend(Roo.form.DayPicker, Roo.form.Field,  {
         if (suppressEvent) {
             return ;
         }
-<<<<<<< HEAD
-<<<<<<< HEAD
-        var cur = {};
-        for (var i =0; i < v.length;i++) {
-            cur[v.substring(i,i+1)] = 1 ;
-        }
-=======
          
->>>>>>> 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
             if (on != newv) {
                 e.toggleClass('x-menu-item-checked');
             }

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