First commit readme.txt
Second commit: included Text1.txt
After modifying readme.txt
modified both files
added readme.txt
modified readme file
Merge branch 'Fas' of github.com:Gannon-University/gcis634.2014.team3 into Az
Merge branch 'nasser' of github.com:Gannon-University/gcis634.2014.team3 into Az
Modified files
Modified2
created file_conflict
Merge branch 'master' of github.com:Gannon-University/gcis634.2014.team3
after pulling
modified file_conflict
resolved conflict
resloved conf 2
modified file_conflict
resloved conf 3
resloved conf 4
final modification to file_conflict