diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-11-08 14:38:09 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-11-08 14:38:09 -0500 |
| commit | 4b418ee4900156ad98b316f31b7731d11837b164 (patch) | |
| tree | 177e865439248f116503b5a9027887f4c1ec2bc4 /.config/git/attributes | |
| parent | 73792d5157d709ebe3d5ff35563692ac04e89fbd (diff) | |
| parent | 3477cafcc1ecf1cefd2c36a7fac36c86443ea573 (diff) | |
Merge branch 'master' into gluglugt60-par/master
Diffstat (limited to '.config/git/attributes')
| -rw-r--r-- | .config/git/attributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.config/git/attributes b/.config/git/attributes new file mode 100644 index 0000000..56444aa --- /dev/null +++ b/.config/git/attributes @@ -0,0 +1 @@ +ChangeLog merge=merge-changelog |