new build with conflicts resolved
new build with conflicts resolved

rajeshwarpatlolla/ionic-datepicker,OSAMES/ionic-datepicker,silvercar/ionic-datepicker,OSAMES/ionic-datepicker,ignacio-chiazzo/ionic-datepicker-extended,ignacio-chiazzo/ionic-datepicker-extended,rajeshwarpatlolla/ionic-datepicker,silvercar/ionic-datepicker