orbit-oss/flask
4
5
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set merge strategy for CHANGES

Browse source
This commit is contained in:
Armin Ronacher 2016-09-12 21:55:17 +03:00
parent de6067e0d4
commit 1759c20945
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
CHANGES merge=union