upgrade

app/assets/javascripts/CRM.js

@@ -16,11 +16,6 @@
 //= require bootstrap/js/bootstrap-material-design.min
 //= require jquery_ujs
 //= require turbolinks
-<<<<<<< HEAD
-//= require cable
-//= require jquery-ui
-//= require bootstrap-datepicker
-=======
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require jquery-slimscroll/jquery.slimscroll.js
@@ -32,13 +27,10 @@
 //= require custom.js
 
 $(document).on('turbolinks:load', function() {
->>>>>>> 01c4eeca81e1eac7bf7fe5854142a9663e104249
-
     $('.datepicker').bootstrapMaterialDatePicker({
         format: 'DD-MM-YYYY',
         clearButton: true,
         weekStart: 1,
         time: false
     });
-   
 });