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