git-practice

I made a conflict branch change ripo update on conflict-remote

Name		Name	Last commit message	Last commit date
Latest commit History 19 Commits
.gitignore		.gitignore
README.md		README.md
foo.txt		foo.txt
namechanged2.txt		namechanged2.txt
newfile.txt		newfile.txt

Provide feedback