aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-06-30 08:26:24 +0800
committerDan Finlay <dan@danfinlay.com>2016-06-30 08:26:24 +0800
commitd34dcc66d705dacaf7f7db16b5302808217b0c68 (patch)
treee4a708c8f073f1ef090dc495b8c553e75652483d /.gitattributes
parentf7bb3cdcfebacc3f3970b469503db202e0bdda28 (diff)
downloadtangerine-wallet-browser-d34dcc66d705dacaf7f7db16b5302808217b0c68.tar.gz
tangerine-wallet-browser-d34dcc66d705dacaf7f7db16b5302808217b0c68.tar.zst
tangerine-wallet-browser-d34dcc66d705dacaf7f7db16b5302808217b0c68.zip
Add gitattributes file for the changelog
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index 212566614..7e800609e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-* text=auto \ No newline at end of file
+CHANGELOG merge=union \ No newline at end of file