There was a problem fetching the latest pipeline status.
merge conflicts
Showing
- .DS_Store 0 additions, 0 deletions.DS_Store
- CoefficientEditor/index.php 23 additions, 37 deletionsCoefficientEditor/index.php
- SalaryCalculator/index.php 43 additions, 14 deletionsSalaryCalculator/index.php
- SalaryCalculator/models/GajiPegawai.php 1 addition, 1 deletionSalaryCalculator/models/GajiPegawai.php
- SalaryCalculator/models/Koefisien.php 16 additions, 0 deletionsSalaryCalculator/models/Koefisien.php
- SalaryCalculator/models/NilaiPerformansi.php 18 additions, 0 deletionsSalaryCalculator/models/NilaiPerformansi.php
- SalaryCalculator/models/Pegawai.php 2 additions, 0 deletionsSalaryCalculator/models/Pegawai.php
- SalaryCalculator/models/Penduduk.php 32 additions, 0 deletionsSalaryCalculator/models/Penduduk.php
- db_ppl_core_filled.sql 26 additions, 0 deletionsdb_ppl_core_filled.sql
- salaryman.sql 239 additions, 262 deletionssalaryman.sql
- salaryman/.DS_Store 0 additions, 0 deletionssalaryman/.DS_Store
- salaryman/app/.DS_Store 0 additions, 0 deletionssalaryman/app/.DS_Store
- salaryman/app/config/config.ini 6 additions, 3 deletionssalaryman/app/config/config.ini
- salaryman/app/config/services.php 36 additions, 4 deletionssalaryman/app/config/services.php
- salaryman/app/controllers/CoefficientsController.php 140 additions, 77 deletionssalaryman/app/controllers/CoefficientsController.php
- salaryman/app/controllers/IndexController.php 7 additions, 8 deletionssalaryman/app/controllers/IndexController.php
- salaryman/app/controllers/StatisticsController.php 8 additions, 1 deletionsalaryman/app/controllers/StatisticsController.php
- salaryman/app/controllers/UsersController.php 1 addition, 1 deletionsalaryman/app/controllers/UsersController.php
- salaryman/app/views/.DS_Store 0 additions, 0 deletionssalaryman/app/views/.DS_Store
- salaryman/app/views/coefficients/editAnak.volt 4 additions, 5 deletionssalaryman/app/views/coefficients/editAnak.volt
Please register or sign in to comment