diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-08-22 23:54:11 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-08-22 23:54:11 -0400 |
| commit | 0e74e8a875289fba635170585420392805b84ab2 (patch) | |
| tree | d9be78ef29e43c307e4dd279f386685db279d7c2 /.gitattributes | |
| parent | fc3caba25d74c373204d617ecc54dae9697f06d3 (diff) | |
update changelog location
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 5d425843f..a81b30b93 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -debian/changelog merge=dpkg-mergechangelogs +CHANGELOG merge=dpkg-mergechangelogs |