Adugare fisier text.txt
Merge branch 'user2'