Closed luongquy08 closed 7 years ago
nó bị conflicts nên không merge tự động được:
This branch has conflicts that must be resolved Conflicting files Nhom-FAM/1.html Nhom-FAM/2.html Nhom-FAM/3.html Nhom-FAM/4.html Nhom-FAM/readme.md
Dạ vâng, để em xử lý conflicts rồi pullrequest lại cho thầy.
This branch has conflicts that must be resolved Use the web editor or the command line to resolve conflicts. Conflicting files Nhom-FAM/1.html Nhom-FAM/2.html Nhom-FAM/3.html Nhom-FAM/4.html Nhom-FAM/readme.md