There was an error fetching the commit references. Please try again later.
Fixed merge conflict
Showing
- app/Exceptions/Handler.php 8 additions, 3 deletionsapp/Exceptions/Handler.php
- app/Http/Controllers/DataKinerjaController.php 72 additions, 6 deletionsapp/Http/Controllers/DataKinerjaController.php
- app/Http/Controllers/DataKompetensiController.php 177 additions, 32 deletionsapp/Http/Controllers/DataKompetensiController.php
- app/Http/Controllers/Pegawai/PegawaiAPIController.php 102 additions, 38 deletionsapp/Http/Controllers/Pegawai/PegawaiAPIController.php
- app/Kinerja.php 5 additions, 3 deletionsapp/Kinerja.php
- composer.json 2 additions, 1 deletioncomposer.json
- composer.lock 318 additions, 0 deletionscomposer.lock
- config/app.php 2 additions, 1 deletionconfig/app.php
- config/database.php 1 addition, 1 deletionconfig/database.php
- database/seeds/AsesmenSeeder.php 2 additions, 2 deletionsdatabase/seeds/AsesmenSeeder.php
- package-lock.json 1589 additions, 1473 deletionspackage-lock.json
- package.json 1 addition, 1 deletionpackage.json
- public/css/profile.css 14 additions, 12 deletionspublic/css/profile.css
- public/js/app.js 35086 additions, 34974 deletionspublic/js/app.js
- public/js/profile.js 47290 additions, 0 deletionspublic/js/profile.js
- public/mix-manifest.json 3 additions, 1 deletionpublic/mix-manifest.json
- resources/assets/js/app.js 0 additions, 130 deletionsresources/assets/js/app.js
- resources/assets/js/components/PMOMainPage.vue 1 addition, 1 deletionresources/assets/js/components/PMOMainPage.vue
- resources/assets/js/profile.js 149 additions, 0 deletionsresources/assets/js/profile.js
- resources/assets/sass/profile.scss 33 additions, 0 deletionsresources/assets/sass/profile.scss
Please register or sign in to comment