folder added
folder added
Merge branch 'branch2'
-Pratap Vhatkar in 1.txtx
coflicked resolved
2 has created
2 new file commit
Merge branch 'branch2' into branch1
3 files have creted
asjhdsd
changes made in branch 1
file deleted