1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-22 09:23:21 +01:00

Fix gitattributes

This commit is contained in:
Dan Finlay 2016-06-29 17:28:49 -07:00
parent ab5730aa26
commit 9a8ede2210

2
.gitattributes vendored
View File

@ -1 +1 @@
CHANGELOG merge=union
CHANGELOG.md merge=union