BenMatteson / CS410_Agile_Group2

CS410 Agile Practice Project - FTP Client
0 stars 2 forks source link

Mahmoud branch #47

Closed MahmoudM14 closed 5 years ago

MahmoudM14 commented 5 years ago

modification after code review

BenMatteson commented 5 years ago

it looks like you got all the changes, but it can't merge... it's missing the original changes, your probably need to do a rebase or a merge to get it sorted out.