fix: merge conflict
Showing
- src/app.module.ts 20 additions, 27 deletionssrc/app.module.ts
- src/approval/approval.controller.ts 0 additions, 60 deletionssrc/approval/approval.controller.ts
- src/approval/approval.dto.ts 0 additions, 8 deletionssrc/approval/approval.dto.ts
- src/approval/approval.module.ts 0 additions, 12 deletionssrc/approval/approval.module.ts
- src/approval/approval.service.ts 0 additions, 33 deletionssrc/approval/approval.service.ts
- src/bimbingan/bimbingan.dto.ts 1 addition, 1 deletionsrc/bimbingan/bimbingan.dto.ts
- src/bimbingan/bimbingan.module.ts 1 addition, 1 deletionsrc/bimbingan/bimbingan.module.ts
- src/bimbingan/bimbingan.service.ts 1 addition, 1 deletionsrc/bimbingan/bimbingan.service.ts
- src/dashboard/dashboard.controller.ts 13 additions, 0 deletionssrc/dashboard/dashboard.controller.ts
- src/dashboard/dashboard.dto.ts 75 additions, 3 deletionssrc/dashboard/dashboard.dto.ts
- src/dashboard/dashboard.module.ts 12 additions, 1 deletionsrc/dashboard/dashboard.module.ts
- src/dashboard/dashboard.service.ts 140 additions, 1 deletionsrc/dashboard/dashboard.service.ts
- src/dosen-bimbingan/dosen-bimbingan.controller.ts 10 additions, 56 deletionssrc/dosen-bimbingan/dosen-bimbingan.controller.ts
- src/dosen-bimbingan/dosen-bimbingan.dto.ts 3 additions, 33 deletionssrc/dosen-bimbingan/dosen-bimbingan.dto.ts
- src/dosen-bimbingan/dosen-bimbingan.service.ts 2 additions, 111 deletionssrc/dosen-bimbingan/dosen-bimbingan.service.ts
- src/entities/berkasBimbingan.entity.ts 4 additions, 2 deletionssrc/entities/berkasBimbingan.entity.ts
- src/entities/berkasSubmisiTugas.entity.ts 28 additions, 0 deletionssrc/entities/berkasSubmisiTugas.entity.ts
- src/entities/berkasTugas.entity.ts 26 additions, 0 deletionssrc/entities/berkasTugas.entity.ts
- src/entities/bimbingan.entity.ts 1 addition, 1 deletionsrc/entities/bimbingan.entity.ts
- src/entities/kelas.entity.ts 7 additions, 2 deletionssrc/entities/kelas.entity.ts
Please register or sign in to comment