diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-06-30 08:28:49 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-06-30 08:28:49 +0800 |
| commit | 9a8ede22106c3f59d014be4905a078711180d30c (patch) | |
| tree | 776ca81201108efe49f9103792423275e959d9bb /.gitattributes | |
| parent | ab5730aa26d23b64f5ddcc6f507502d9a0a6ee81 (diff) | |
| download | tangerine-wallet-browser-9a8ede22106c3f59d014be4905a078711180d30c.tar tangerine-wallet-browser-9a8ede22106c3f59d014be4905a078711180d30c.tar.gz tangerine-wallet-browser-9a8ede22106c3f59d014be4905a078711180d30c.tar.bz2 tangerine-wallet-browser-9a8ede22106c3f59d014be4905a078711180d30c.tar.lz tangerine-wallet-browser-9a8ede22106c3f59d014be4905a078711180d30c.tar.xz tangerine-wallet-browser-9a8ede22106c3f59d014be4905a078711180d30c.tar.zst tangerine-wallet-browser-9a8ede22106c3f59d014be4905a078711180d30c.zip | |
Fix gitattributes
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 7e800609e..a19ade077 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -CHANGELOG merge=union
\ No newline at end of file +CHANGELOG.md merge=union |