Fix merge conflict on datetimepicker
Showing
- package-lock.json 27 additions, 19 deletionspackage-lock.json
- package.json 3 additions, 1 deletionpackage.json
- resources/assets/js/app.js 2 additions, 1 deletionresources/assets/js/app.js
- resources/assets/js/bulk_upload.js 12 additions, 19 deletionsresources/assets/js/bulk_upload.js
- resources/assets/sass/app.scss 3 additions, 0 deletionsresources/assets/sass/app.scss
- resources/views/layouts/app.blade.php 4 additions, 1 deletionresources/views/layouts/app.blade.php
- resources/views/mahasiswa/form_pengajuan_topik.blade.php 36 additions, 36 deletionsresources/views/mahasiswa/form_pengajuan_topik.blade.php
- resources/views/manajer/detail_mahasiswa_control.blade.php 60 additions, 10 deletionsresources/views/manajer/detail_mahasiswa_control.blade.php
Please register or sign in to comment