Created Doc.txt

Create new text file Doc.txt in MyAndroid
Edit Doc content

Add some text to Doc.txt
Create new Directory

Created NewDir folder and DocinNewDir.txt
Merge branch 'HEAD' of https://github.com/phucdat1105/MyAndroid.git into changeDocContent
Change2

Add Dir2 and put inside it a New Text Document
Merge branch 'changeDocContent' of https://github.com/phucdat1105/MyAndroid.git
Merge branch 'Change2' of https://github.com/phucdat1105/MyAndroid.git
Change3

Change in Dir2 create new Text Docunent
A

A
A

A
AB

AB
A

A
A

A
Merge branch 'Change2' of https://github.com/phucdat1105/MyAndroid.git
Merge branch 'Change3' of https://github.com/phucdat1105/MyAndroid.git
Merge branch 'v1.2'

Conflicts:
	MyAndroid
Merge branch 'V1.1'

Conflicts:
	MyAndroid