status-im
/
re-frame
mirror of https://github.com/status-im/re-frame.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add gitattributes file for CHANGES.md to avoid merge conflicts

This commit is contained in:
Daniel Compton 2016-11-07 08:41:19 +13:00
parent 41990cf60f
commit 38872f151d
No known key found for this signature in database
GPG Key ID: A6E4DC5283B5DCEC
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

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