Resolved merge conflict
Showing
- app/Http/Controllers/.fuse_hidden00000c2b00000001 0 additions, 55 deletionsapp/Http/Controllers/.fuse_hidden00000c2b00000001
- app/Http/Controllers/DataKinerjaController.php 3 additions, 1 deletionapp/Http/Controllers/DataKinerjaController.php
- app/Http/Controllers/DataKompetensiController.php 3 additions, 1 deletionapp/Http/Controllers/DataKompetensiController.php
- app/Http/Controllers/DataPegawaiController.php 3 additions, 1 deletionapp/Http/Controllers/DataPegawaiController.php
- app/Http/Controllers/KepegawaianController.php 50 additions, 0 deletionsapp/Http/Controllers/KepegawaianController.php
- app/Http/Controllers/Pegawai/PegawaiAPIController.php 58 additions, 78 deletionsapp/Http/Controllers/Pegawai/PegawaiAPIController.php
- app/Http/Controllers/PendidikanPekerjaanController.php 0 additions, 10 deletionsapp/Http/Controllers/PendidikanPekerjaanController.php
- app/Http/Controllers/ProfileController.php 17 additions, 2 deletionsapp/Http/Controllers/ProfileController.php
- app/Http/Controllers/RiwayatController.php 82 additions, 0 deletionsapp/Http/Controllers/RiwayatController.php
- app/Http/Controllers/SertifikatController.php 40 additions, 22 deletionsapp/Http/Controllers/SertifikatController.php
- composer.json 2 additions, 1 deletioncomposer.json
- composer.lock 162 additions, 88 deletionscomposer.lock
- config/excel.php 704 additions, 0 deletionsconfig/excel.php
- public/css/profile.css 0 additions, 4 deletionspublic/css/profile.css
- public/js/profile.js 704 additions, 256 deletionspublic/js/profile.js
- public/profile/649660532340430924.gif 0 additions, 0 deletionspublic/profile/649660532340430924.gif
- public/sertifikat/649660532340430924_0.jpeg 0 additions, 0 deletionspublic/sertifikat/649660532340430924_0.jpeg
- public/sertifikat/649660532340430924_2.gif 0 additions, 0 deletionspublic/sertifikat/649660532340430924_2.gif
- public/sertifikat/649660532340430924_2.jpeg 0 additions, 0 deletionspublic/sertifikat/649660532340430924_2.jpeg
- public/sertifikat/649660532340430924_3.jpeg 0 additions, 0 deletionspublic/sertifikat/649660532340430924_3.jpeg
Please register or sign in to comment