templates / this--descriptionon commit merge-recursive: new function for better colliding conflict resolutions (37b65ce)
   1Unnamed repository; edit this file 'description' to name the repository.