Merge branch 'en/merge-path-collision'
[git] / templates / this--description
1 Unnamed repository; edit this file 'description' to name the repository.