diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:17:27 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:17:27 +0000 |
commit | 7b3d5890037484a6ee4573744869f28301902a8b (patch) | |
tree | 421062658afbf3303827539a888f86d5f73432ba /.gitattributes | |
parent | Releasing progress-linux version 13.16-0.0~progress7.99u1. (diff) | |
download | debhelper-7b3d5890037484a6ee4573744869f28301902a8b.tar.xz debhelper-7b3d5890037484a6ee4573744869f28301902a8b.zip |
Merging upstream version 13.17.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..5d42584 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +debian/changelog merge=dpkg-mergechangelogs |