administrator/Panic-Button
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Menyelesaikan merge conflict

Browse Source
This commit is contained in:
HagaDalpintoGinting 2025-11-13 15:46:19 +07:00
commit cebaf14306
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -9,6 +9,7 @@ Repository ini digunakan untuk praktikum perkuliahan pemrograman mobile.
- Arif Dwiyanto: arif.dwiyanto@ubharajaya.ac.id - Arif Dwiyanto: arif.dwiyanto@ubharajaya.ac.id
## Mahasiswa ## Mahasiswa
<<<<<<< HEAD
- 1. Dendi Yogia Pratama (202310715051) - 1. Dendi Yogia Pratama (202310715051)
- 2. Nuryuda Maulana (202310715038) - 2. Nuryuda Maulana (202310715038)
- 3. Haga Dalpinto Ginting (202310715176) - 3. Haga Dalpinto Ginting (202310715176)
@ -26,8 +27,16 @@ Repository ini digunakan untuk praktikum perkuliahan pemrograman mobile.
- 15. Indris Alpasela (202310715200) - 15. Indris Alpasela (202310715200)
- 16. Raihan Ariq Muzakki (202310715297) - 16. Raihan Ariq Muzakki (202310715297)
- 17. Dirson Ali Wardana (202310715246) - 17. Dirson Ali Wardana (202310715246)
<<<<<<< HEAD
- 18. Dimas Hendri Pamungkas (202310715274) - 18. Dimas Hendri Pamungkas (202310715274)
- 19. Fadhlul Wafi (202310715188) - 19. Fadhlul Wafi (202310715188)
- 20. Muhammad Yusron Amrullah (202310715060) - 20. Muhammad Yusron Amrullah (202310715060)
- 21. Muhammad Fadillah (202310715213) - 21. Muhammad Fadillah (202310715213)
- 21. Hadi Guna Prakoso (202310715312) - 21. Hadi Guna Prakoso (202310715312)
=======
=======
- Fadlan Rivaldi (202310715280)
- B
- C
>>>>>>> d4f073d (First Commit)
>>>>>>> 59a5f2b68a9a33028bb744220857c043749c6949