Project

General

Profile

« Previous | Next » 

Revision 8fb2f8c2

Added by Andreas Kohlbecker over 6 years ago

#4979 setting merge=ours in gitattributes to avoid merge conflicts in gitflow

  • added
  • modified
  • copied
  • renamed
  • deleted