Fakultas Ilmu Komputer UI

Commit 97563449 authored by Bimo Iman Smartadi's avatar Bimo Iman Smartadi
Browse files

[Problem] merging problem

parent 3faa9ac4
Pipeline #44970 passed with stages
in 17 minutes and 50 seconds
......@@ -206,7 +206,6 @@ It will return a json with key:
* `jumlah_siswa` : number of students
* `status` : status of the sekolah (swasta, negri, or international)
* `jenis_sekolah` : type of sekolah's management (inklusi, segregasi)
<<<<<<< HEAD
* `akreditasi` : accreditation
### 15. To register penyandang disabilitas:
......@@ -269,6 +268,4 @@ It will return a json with these key:
* `deskripsi` : The description of the comment
* `creator` : The last name of the commentator
* `date_time` : The time when the comment was posted
=======
* `akreditasi` : accreditation
>>>>>>> parent of 535bf15... Merge branch 'PBI-7-fitur_informasi_layanan_khusus_disabilitas' into 'staging'
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment